diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
index 932c6d64a3db672f02db0a596ec14b5a644100f8..9ac2212142ee15469577690613abbc85ece70c30 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/bordereau.json
@@ -1,6 +1,6 @@
 {
   "created_at": "Mon, 01 Oct 2007 12:00:00 GMT",
-  "misc": "IPMI 2.0, BIOS Version 1.32",
+  "misc": "IPMI 2.0",
   "model": "IBM System x3455",
   "type": "cluster",
   "uid": "bordereau"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
index 3ee862c217701392ac30d1c102aab4d0d0716c8e..1903c00420fcd795cebfb7532819f70effd007c4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-1.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.102",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.102",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.103",
+      "mac": null,
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-1-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
index 017e4288991c78d77963e36036868560d0a75486..69766cd8f1df3a98bd962925cb6a4bd3cc505bdd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-10.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWH"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.111",
-      "mac": "",
+      "mac": "00:14:5e:55:6b:ca",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.111",
-      "mac": "",
+      "mac": "00:14:5e:55:6b:cb",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.112",
+      "mac": "00:14:5e:55:6b:cc",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-10-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
index 9b66978e2ac81e275268e32d5c96e906ad5a1fc5..562390ff0d065c4c68c5fc0c7a0fe2369089ea6a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-11.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXW"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.112",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:81",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.112",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:82",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.113",
+      "mac": "00:14:5e:55:5c:83",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-11-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
index e63dd48e643a0edebae7ff0c8413cb7ed141d367..6918bfef1883a8105ef38138dd8ecc44f3b60f25 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-12.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.30-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZR"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.113",
-      "mac": "",
+      "mac": "00:14:5e:55:58:f7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.113",
-      "mac": "",
+      "mac": "00:14:5e:55:58:f8",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.114",
+      "mac": "00:14:5e:55:58:f9",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-12-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
index 0459892cd41238fe6aa6b1dfb7f2779698d8c32c..4dba4a284ec8669b1fe050e2d95f4ff4aeed2f45 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-13.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXK"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.114",
-      "mac": "",
+      "mac": "00:14:5e:55:59:63",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.114",
-      "mac": "",
+      "mac": "00:14:5e:55:59:64",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.115",
+      "mac": "00:14:5e:55:59:65",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-13-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
index 6f67f219520e4a76daf069065e02a51b077bb493..3bbdaeb2fc090ebfc35f7013bffa68815b3b61e0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-14.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZF"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.115",
-      "mac": "",
+      "mac": "00:14:5e:55:59:5d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.115",
-      "mac": "",
+      "mac": "00:14:5e:55:59:5e",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.116",
+      "mac": "00:14:5e:55:59:5f",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-14-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
index 2136a57eb34ec51030152610c4322b9aae40ab45..e08df1a2a8df28b398c132823e59b063390594e1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-15.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWB"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.116",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:f2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.116",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:f3",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.117",
+      "mac": "00:14:5e:55:6a:f4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-15-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
index 26a257f76ac7d49dc921c6c432388e260925240f..c570b7bb66e345f64b619861e56b265f47a8721b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-16.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXD"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.117",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:ec",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.117",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:ed",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.118",
+      "mac": "00:14:5e:55:5d:ee",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-16-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
index 2b1d96bc893a6f825335922a4338516ef3cb132e..1639a9ca46bfbe9346d3cf9f4fdbdfcab21c27e4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-17.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYW"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.118",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:a9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.118",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:aa",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.119",
+      "mac": "00:14:5e:55:5e:ab",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-17-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
index cd87e7cd5c9331fd142e75af21ee3595c5753b5d..69b7cd88a2e0b7297df05e400f9f64dcccc4b6a9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-18.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYN"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.119",
-      "mac": "",
+      "mac": "00:14:5e:55:64:0d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.119",
-      "mac": "",
+      "mac": "00:14:5e:55:64:0e",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.120",
+      "mac": "00:14:5e:55:64:0f",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-18-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
index acedb82c263c8d06da2cb9a91415cb9173ceb8ff..063dfed2df67a2e4f7ecd6217723bfc9fcbf6e4e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-19.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXN"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.120",
-      "mac": "",
+      "mac": "00:14:5e:55:68:67",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.120",
-      "mac": "",
+      "mac": "00:14:5e:55:68:68",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.121",
+      "mac": "00:14:5e:55:68:69",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-19-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
index dcfbbc87b386dba057e879858d022dae0a902e25..70ca3e69e4801262a2613fd4caa0c3581b88f3c4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-2.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.103",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.103",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:2d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.104",
+      "mac": "00:14:5e:55:5d:2e",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-2-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
index de763bf7ae81a73329e615feea425a660650377a..670ac63e959bd757f26b4a7bee2122a68c3c652c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-20.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXB"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.121",
-      "mac": "",
+      "mac": "00:14:5e:55:62:b1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.121",
-      "mac": "",
+      "mac": "00:14:5e:55:62:b2",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.122",
+      "mac": "00:14:5e:55:62:b3",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-20-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
index 0341c09d8007300176c1f710908026905fece008..8a2042962b998c2ace034e4853201240e5e454d4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-21.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXV"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.122",
-      "mac": "",
+      "mac": "00:14:5e:55:5a:98",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.122",
-      "mac": "",
+      "mac": "00:14:5e:55:5a:99",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.123",
+      "mac": "00:14:5e:55:5a:9a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-21-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
index ed9b0f9f53c183dbfa6a531293e26fe6ca0a5111..dc42125bb42c5c33a767c12dec414c53d8ddfdf7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-22.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWY"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.123",
-      "mac": "",
+      "mac": "00:14:5e:55:59:84",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.123",
-      "mac": "",
+      "mac": "00:14:5e:55:59:85",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.124",
+      "mac": "00:14:5e:55:59:86",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-22-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
index e3b8e4c27e48029ff4cd426fc9c93b0f7ce0511f..0b9b5aaf10399057ba1976fbf8adf5cbcf1f3a92 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-23.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWM"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.124",
-      "mac": "",
+      "mac": "00:14:5e:55:62:96",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.124",
-      "mac": "",
+      "mac": "00:14:5e:55:62:97",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.125",
+      "mac": "00:14:5e:55:62:98",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-23-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
index 55a04bc08b5da3e8c4b772a3c33f9458618f87e0..6d261f78826471676472d98434c57ea39689d012 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-24.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAA"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.125",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:da",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.125",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:db",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.126",
+      "mac": "00:14:5e:55:5d:dc",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-24-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
index 9225a20b1fe7642f64802452b15a03edbd48feb7..9503d61c32c12b4c3edf1d393b033184cb3c76d6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-25.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYT"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.126",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:b9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.126",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:ba",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.127",
+      "mac": "00:14:5e:55:5d:bb",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-25-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
index d6df5084ad92626a4fdba4ded814c3701d3d1f2a..83152c7173b22eaa3fc9a040d6b93fcc74704da1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-26.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRVW"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.127",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:2f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.127",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:30",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.128",
+      "mac": "00:14:5e:55:6d:31",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-26-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
index bb4795e92102b899f8f249d75b4f9643cf3ef289..173308d2297fc9a37ce164c48e5e0b86307d388b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-27.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAG"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.128",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:69",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.128",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:6a",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.129",
+      "mac": "00:14:5e:55:5d:6b",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-27-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
index 00b16b6104a639cd0e66b07f170f43e24c392bea..e59da533e91dc0288fd4897ca33aedaf53fdd238 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-28.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYZ"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.129",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.129",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:89",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.130",
+      "mac": "00:14:5e:55:5e:8a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-28-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
index 2a2c7b594419af12af93f7addad516c941331851..b224b9f027afa6989c6d0f49b5f292b55a877ec3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-29.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAH"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.130",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:c3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.130",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:c4",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.131",
+      "mac": "00:14:5e:55:5c:c5",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-29-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
index 2d9cf5e7fd8d59b7261fbc75a8d0d21023dc5280..f378dfb1e4d5405d8ef550aea07d9b16999f2e34 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-3.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZH"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.104",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:42",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.104",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:43",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.105",
+      "mac": "00:14:5e:55:5c:44",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-3-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
index 8d143a1b02ca2bd375c9b77bf7b758f1db7d3f66..cf71be2b770ecd5df28302151ac7a191d94b5ca9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-30.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.131",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:d6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.131",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:d7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.132",
+      "mac": "00:14:5e:55:5e:d8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-30-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
index 674f377c48599cd18793681df8d2745789fb3880..fe7bf332a99e1937cc62890fe810f7e7d50bc7cb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-31.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWL"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.132",
-      "mac": "",
+      "mac": "00:14:5e:55:59:b7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.132",
-      "mac": "",
+      "mac": "00:14:5e:55:59:b8",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.133",
+      "mac": "00:14:5e:55:59:b9",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-31-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
index b5c9bc98dd6e090976e246f39b5a11416e3d0c55..f53a81c872becd841cd8f46d6b74af39a96df43d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-32.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXA"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.133",
-      "mac": "",
+      "mac": "00:14:5e:55:59:bd",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.133",
-      "mac": "",
+      "mac": "00:14:5e:55:59:be",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.134",
+      "mac": "00:14:5e:55:59:bf",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-32-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
index 33d49ae211ec674136c72912b11955574535271a..82061a1dca11430043d2c8c0a3745f125b07d4c0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-33.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYH"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.134",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:b2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.134",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:b3",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.135",
+      "mac": "00:14:5e:55:5e:b4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-33-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
index bf01f61e158a5ead0efc77ffcfc17a24acc7097e..3a76579e0948f73199c683f84f9cba0544596107 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-34.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.135",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:02",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.135",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:03",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.136",
+      "mac": "00:14:5e:55:5d:04",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-34-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
index ac78d081de43958c5e3dc46c15a1abedafdf2c9c..0c6fdcd883f5b99f6b1fe0bfc07a20f06145d0a5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-35.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZZ"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.136",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.136",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:23",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.137",
+      "mac": "00:14:5e:55:5e:24",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-35-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
index 2d092cb8701ed539d5f3a0b3497db5a795e0eb8d..0b49324f6c81e96f8477271ed2a8eba7befc3986 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-36.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAC"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.137",
-      "mac": "",
+      "mac": "00:14:5e:55:69:f0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.137",
-      "mac": "",
+      "mac": "00:14:5e:55:69:f1",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.138",
+      "mac": "00:14:5e:55:69:f2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-36-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
index 11cc1903fbdfe780fa68b76cb1cf362bb3610bbb..ae0b83aaea7d496a49ecb0101b66980897f86d27 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-37.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZL"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.138",
-      "mac": "",
+      "mac": "00:14:5e:55:5f:d2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.138",
-      "mac": "",
+      "mac": "00:14:5e:55:5f:d3",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.139",
+      "mac": "00:14:5e:55:5f:d4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-37-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
index eda3a32175c9b07a9dadf0bbb4c1efc36e53fe0f..de8cbbf9cd674d3fb02e3a242b528d30270ef2b9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-38.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZP"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.139",
-      "mac": "",
+      "mac": "00:14:5e:55:5f:0f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.139",
-      "mac": "",
+      "mac": "00:14:5e:55:5f:10",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.140",
+      "mac": "00:14:5e:55:5f:11",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-38-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
index 0fd23e9313994c4f63656ba7fcad4f75bb8b5a66..ed4a10022361e6fc662bfd9cd3a30934749d0a82 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-39.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYG"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.140",
-      "mac": "",
+      "mac": "00:14:5e:55:63:2f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.140",
-      "mac": "",
+      "mac": "00:14:5e:55:63:30",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.141",
+      "mac": "00:14:5e:55:63:31",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-39-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
index c3a7b4bc726143acd3544d7259bd8fe3959c1fc0..f470c2ee8fd111b961a9c208e40e8c9cecb088e9 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-4.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.105",
-      "mac": "",
+      "mac": "00:14:5e:55:68:c7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.105",
-      "mac": "",
+      "mac": "00:14:5e:55:68:c8",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.106",
+      "mac": "00:14:5E:55:68:C9",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-4-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
index ba508985d0fb8060fa75bcf73d4f55b8b4a163f0..be9e4e5a3174a4ef5560c887ad393501c81e7697 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-40.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.141",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.141",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.142",
+      "mac": null,
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-40-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
index 2e6eff565206be9da82bfec949ded06a7cb55b33..f3adb78873f22ce769407d1790bf272a0dd122a6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-41.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.142",
-      "mac": "",
+      "mac": "00:14:5e:55:59:00",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.142",
-      "mac": "",
+      "mac": "00:14:5e:55:59:01",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.143",
+      "mac": "00:14:5e:55:59:02",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-41-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
index 1f2a8754338cc439503492d4c514d90ae3c8b899..860e97f3efbda8e3ccd8be7ffe009a569156f9bc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-42.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYF"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.143",
-      "mac": "",
+      "mac": "00:14:5e:55:60:95",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.143",
-      "mac": "",
+      "mac": "00:14:5e:55:60:96",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.144",
+      "mac": "00:14:5e:55:60:97",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-42-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
index 46eec6ea199927a67e0456e48471bc00e666bb93..967d83c65bd0a7189f3e04c4870b13f79b5885cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-43.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWD"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.144",
-      "mac": "",
+      "mac": "00:14:5e:55:6c:00",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.144",
-      "mac": "",
+      "mac": "00:14:5e:55:6c:01",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.145",
+      "mac": "00:14:5e:55:6c:02",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-43-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
index e9df3e625d19e1a78ef2e61ec81820c566af172f..d86000bf5243617301865ad0d1a736ec4e32e5e3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-44.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXL"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.145",
-      "mac": "",
+      "mac": "00:14:5e:55:59:d2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.145",
-      "mac": "",
+      "mac": "00:14:5e:55:59:d3",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.146",
+      "mac": "00:14:5e:55:59:d4",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-44-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
index 6b7ba66dfd21b896e9fd315af8f85b54b0872aa3..85e98f5fa6be3146419235481557b91a5fc2b44b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-45.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWZ"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.146",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:bd",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.146",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:be",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.147",
+      "mac": "00:14:5e:55:5c:bf",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-45-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
index 08b83fb73c28477318db189f8bd7d349a19f6fac..cb0901ff6f3907fc417ea366a2f4923352e9d537 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-46.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYY"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.147",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:60",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.147",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:61",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.148",
+      "mac": "00:14:5e:55:5c:62",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-46-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
index 0064e36db4f8171f7dfabba032e14336f9327a12..65fc23a336086e29131e594eefaa8dc1948bb602 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-47.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWA"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.148",
-      "mac": "",
+      "mac": "00:14:5e:55:6c:a8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.148",
-      "mac": "",
+      "mac": "00:14:5e:55:6c:a9",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.149",
+      "mac": "00:14:5e:55:6c:aa",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-47-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
index 257f1656b9ccf02c0b27ef9d8f9a92d4db4673bc..6872c446f404b98d61f2b337619ed90ee2375879 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-48.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZV"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.149",
-      "mac": "",
+      "mac": "00:14:5e:55:58:fd",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.149",
-      "mac": "",
+      "mac": "00:14:5e:55:58:fe",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.150",
+      "mac": "00:14:5e:55:58:ff",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-48-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
index ae28986129cad68abdeff3ce9571cbabed7d8fae..185e164c5ea3dfc78a0c581afdadcb2e51c56c2a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-49.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZA"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.150",
-      "mac": "",
+      "mac": "00:14:5e:55:62:e7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.150",
-      "mac": "",
+      "mac": "00:14:5e:55:62:e8",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.151",
+      "mac": "00:14:5e:55:62:d9",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-49-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
index 69a75ebbd9957f96ea5c5f38809df5799675fbc2..00094d631d3a7db75e684692b33f85021eea6620 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-5.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXT"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.106",
-      "mac": "",
+      "mac": "00:14:5e:55:61:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.106",
-      "mac": "",
+      "mac": "00:14:5e:55:61:95",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.107",
+      "mac": "00:14:5e:55:61:96",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-5-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
index 7aa70eada11fc124a459294b95418fd2bc065ef9..50db2a4943f34716028b1b88ee0b0761b6469ada 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-50.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYR"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.151",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.151",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:ad",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.152",
+      "mac": "00:14:5e:55:5e:ae",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-50-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
index 0882d9618cca1735ab319914292fb6f67bdafa66..0954fe78368bbc6f005d59c6e5fe897066791679 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-51.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYA"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.152",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:d5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.152",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:d6",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.153",
+      "mac": "00:14:5e:55:5c:d7",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-51-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
index 5981eaadb868df9c54e11cd05e75c1dce35b1879..56fe1c1ff85d8b83f455304f1ffb7523b8cbb85d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-52.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYP"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.153",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:b3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.153",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:b4",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.154",
+      "mac": "00:14:5e:55:5d:b5",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-52-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
index 6bde2862d54446e03c4bdf6578ec8a94978dc8ce..43d85174a67927450e12f132165950885561b06c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-53.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRVV"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.154",
-      "mac": "",
+      "mac": "00:14:5e:55:6c:1b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.154",
-      "mac": "",
+      "mac": "00:14:5e:55:6c:1c",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.155",
+      "mac": "00:14:5e:55:6c:1d",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-53-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
index 1d0456840a3d4088aa9294f50631a8893179e79a..8c08eb6c236505bc19817f087aee14f9dfd28a83 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-54.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZX"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.155",
-      "mac": "",
+      "mac": "00:14:5e:55:63:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.155",
-      "mac": "",
+      "mac": "00:14:5e:55:63:b7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.156",
+      "mac": "00:14:5e:55:63:b8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-54-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
index efaecdb8b57a20e79ba59714ee9285beadce9457..f85d30e3f0509833e25a05495b548667dfbaf718 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-55.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZY"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.156",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:ed",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.156",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:ee",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.157",
+      "mac": "00:14:5e:55:5c:ef",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-55-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
index 76eb7bde90cc6e54994b42f9e580802fb7f80540..a10c49441c3d59480633e1d0862a96f4a52dede2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-56.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZT"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.157",
-      "mac": "",
+      "mac": "00:14:5e:55:60:cb",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.157",
-      "mac": "",
+      "mac": "00:14:5e:55:60:cc",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.158",
+      "mac": "00:14:5e:55:60:cd",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-56-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
index a4fde9563fa6271d6deacbec93bdb01834ab5ecb..d88e9650dff4eca1730ee2f636678df786ec2980 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-57.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.158",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.158",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.159",
+      "mac": null,
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-57-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
index 1af56e359b0556f43bd53cdf392fa590a8002433..063217e17e23ca7aa1b6f6965d7ac5591b80e91e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-58.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(02/26/2007)",
+    "vendor": "IBM",
+    "version": "1.35-[C0E135AUS-1.35]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZC"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.159",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:a6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.159",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:a7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.160",
+      "mac": "00:14:5e:55:5e:a8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-58-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
index 56528138257f9950591a113d86c8d2541200a5fe..a1ea9d6bb34525b955bb0a54c58c9be7516821ff 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-59.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZD"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.160",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.160",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:d9",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.161",
+      "mac": "00:14:5e:55:5c:da",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-59-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
index e5229aec9557fe5dba3e6fc45581fc8f60e130f6..28eaa45561d02ca453c2018ad83907a8b26360e0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-6.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZM"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.107",
-      "mac": "",
+      "mac": "00:14:5e:55:58:ee",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.107",
-      "mac": "",
+      "mac": "00:14:5e:55:58:ef",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.108",
+      "mac": "00:14:5e:55:58:f0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-6-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
index 629c1c10665a6fab6e0d32986ac9bc6575754118..d264feb02c7b6d7f74b11bc35a10589af11ea9b4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-60.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZN"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.161",
-      "mac": "",
+      "mac": "00:14:5e:55:5b:5b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.161",
-      "mac": "",
+      "mac": "00:14:5e:55:5b:5c",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.162",
+      "mac": "00:14:5e:55:5b:5d",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-60-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
index bf6868deb943248d40a936c84d9a853cd6b81a1d..5178f30f4cd9d8a8e3bd774cef268493367533ed 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-61.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAL"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.162",
-      "mac": "",
+      "mac": "00:14:5e:55:58:49",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.162",
-      "mac": "",
+      "mac": "00:14:5e:55:58:4a",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.163",
+      "mac": "00:14:5e:55:58:4b",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-61-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
index 550754c13d6fce862b3e208e9414dee295a0c8cd..723d3a10e5af2b96e9d150c59a98c558e60d14db 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-62.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWT"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.163",
-      "mac": "",
+      "mac": "00:14:5e:55:63:26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.163",
-      "mac": "",
+      "mac": "00:14:5e:55:63:27",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.164",
+      "mac": "00:14:5e:55:63:28",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-62-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
index 1fe755d6dcc89348546c679ec9674cadc2ee1b17..3de10692266f60d4a7f86adc0ffde64120c03717 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-63.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZB"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.164",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:6c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.164",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:6d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.165",
+      "mac": "00:14:5e:55:5c:6e",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-63-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
index b3a42cc63305ed932a2d3a8ec170152166c0a304..7c0b83e0aa65c83c213c0d6ce0cb9bc65542ce67 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-64.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAD"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.165",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:cf",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.165",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:d0",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.166",
+      "mac": "00:14:5e:55:5c:d1",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-64-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
index 75e23278daf33120123c484a8c0d79f2ed8b8d26..8243da9b7dfd4bca405ab21bf43613e9b5a6b45f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-65.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(02/26/2007)",
+    "vendor": "IBM",
+    "version": "1.35-[C0E135AUS-1.35]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWX"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.166",
-      "mac": "",
+      "mac": "00:14:5e:55:59:f9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.166",
-      "mac": "",
+      "mac": "00:14:5e:55:59:fa",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.167",
+      "mac": "00:14:5e:55:59:fb",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-65-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
index bc36a4495c967e25a7044732fa6b2cb4867dcd60..1430e337cef3e65a8abcc512f02fe604168f9261 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-66.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYX"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.167",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:19",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.167",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:1a",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.168",
+      "mac": "00:14:5e:55:5e:1b",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-66-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
index 144cac80a50a82810c01bea77204a2ed5681ae15..1a8e715c557eefcfe665c330fdece6ac236e4c51 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-67.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZW"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.168",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:1b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.168",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:1c",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.169",
+      "mac": "00:14:5e:55:5c:1d",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-67-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
index 78d7092c554475f93dab32b80f45972147131dc4..bc06555f58c66510e58320e8e742e5b27e1cf34b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-68.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXZ"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.169",
-      "mac": "",
+      "mac": "00:14:5e:55:57:89",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.169",
-      "mac": "",
+      "mac": "00:14:5e:55:57:8a",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.170",
+      "mac": "00:14:5e:55:57:8b",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-68-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
index 588c92dde49b306a96cf7623ffdd66f723c41394..2b5e209dba1dddd80214257de8b807c8ac2b508c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-69.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWW"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.170",
-      "mac": "",
+      "mac": "00:14:5e:55:63:ce",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.170",
-      "mac": "",
+      "mac": "00:14:5e:55:63:cf",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.171",
+      "mac": "00:14:5e:55:63:d0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-69-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
index cf05245ca1acbcbe14c6420b4e56e4175ae6e29a..6e0398041a2dff2492fca66b4feb6885c743e734 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-7.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRVP"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.108",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:7c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.108",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:7d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.109",
+      "mac": "00:14:5e:55:5e:7e",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-7-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
index 0fc0564a92c210d0a1ad62105c202b992b986075..db97c61cffab38208e4932bb11d032eb7a5d3b99 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-70.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWC"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.171",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.171",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:ff",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.172",
+      "mac": "00:14:5e:55:6b:00",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-70-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
index 9b4f50e0cf1541962ca6a5373306c9febf25c8b3..f3d0c50689a5be2dee1ad0b085b25e9bb4e20e9d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-71.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRZK"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.172",
-      "mac": "",
+      "mac": "00:14:5e:55:59:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.172",
-      "mac": "",
+      "mac": "00:14:5e:55:59:45",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.173",
+      "mac": "00:14:5e:55:59:46",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-71-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
index 9f1438a7f67668cc67cc7798e417478da8349a4d..61f298eae37dccfee12208b69d64440bc26d8516 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-72.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXM"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.173",
-      "mac": "",
+      "mac": "00:14:5e:55:5a:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.173",
-      "mac": "",
+      "mac": "00:14:5e:55:5a:3f",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.174",
+      "mac": "00:14:5e:55:5a:40",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-72-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
index 7768e4c295e184598861445a73bee44dc75e9677..e458ba346a99a948ca35079d596e7c6da12275d2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-73.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAK"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.174",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:1a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.174",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:1b",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.175",
+      "mac": "00:14:5e:55:6a:1c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-73-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
index d6cd9f8495223567ab4bbd6d3950dd3424e6fdf2..513a129da8632b4d11936036ead4254fcc1ecd33 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-74.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYM"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.175",
-      "mac": "",
+      "mac": "00:14:5e:55:64:04",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.175",
-      "mac": "",
+      "mac": "00:14:5e:55:64:05",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.176",
+      "mac": "00:14:5e:55:64:06",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-74-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
index de5042f75cd0427ef6567b4803f98827c7bd0179..c757bf6a5e1b0bbc3c2f4f49467fb4bf19325e8c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-75.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWV"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.176",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:af",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.176",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:b0",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.177",
+      "mac": "00:14:5e:55:5e:b1",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-75-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
index 8552de2f754a66db24d2b7caafb942673ff5bde7..dc3996a590262174e3d29d22e35e61aacad3f58e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-76.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAF"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.177",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.177",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:09",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.178",
+      "mac": "00:14:5e:55:5d:0a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-76-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
index a001c4920cea01170dcd7421e0b355a1341195a1..d77ec103cdb95da708632e49e979e8eac788a948 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-77.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWN"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.178",
-      "mac": "",
+      "mac": "00:14:5e:55:63:5f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.178",
-      "mac": "",
+      "mac": "00:14:5e:55:63:60",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.179",
+      "mac": "00:14:5e:55:63:61",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-77-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
index da62373a8b71a2303c9b8168094d409b243b0b03..18b100d4d27e3493cc9017415e8cb285babdd19d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-78.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXP"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.179",
-      "mac": "",
+      "mac": "00:14:5e:55:63:fb",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.179",
-      "mac": "",
+      "mac": "00:14:5e:55:63:fc",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.180",
+      "mac": "00:14:5e:55:63:fd",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-78-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
index 8080b0b51b64dbeb3d9ea2593c35adee191a89db..aa622e7c90f1be076aef76f776b41c4719b62d47 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-79.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.180",
-      "mac": "",
+      "mac": "00:14:5e:55:62:ed",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.180",
-      "mac": "",
+      "mac": "00:14:5e:55:62:ee",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.181",
+      "mac": "00:14:5e:55:62:ef",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-79-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
index c6b9832950ba494d5e6b75bcd81a02bc56a2d7f0..1b868697299533009e5a3bf5c8725c2ae4744d23 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-8.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRVT"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.109",
-      "mac": "",
+      "mac": "00:14:5e:55:60:f8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.109",
-      "mac": "",
+      "mac": "00:14:5e:55:60:f9",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.110",
+      "mac": "00:14:5e:55:60:fa",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-8-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
index 5a92c98043bb08e85aecab21de7aa9c895d2a5d2..186b5aec1bc8a3d1e59fdd6e2fcc74a2ed13ca4a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-80.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYL"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.181",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:ae",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.181",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:af",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.182",
+      "mac": "00:14:5e:55:5c:b0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-80-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
index 680f2a10bb6b9067ed1d532c82cf071f0bb62665..05b32e797863f35a730d2ac12496e579dfbb5c3c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-81.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYV"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.182",
-      "mac": "",
+      "mac": "00:14:5e:55:58:a6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.182",
-      "mac": "",
+      "mac": "00:14:5e:55:58:a7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.183",
+      "mac": "00:14:5e:55:58:a8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-81-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
index 2bfe3e5f779de4389ecd8b1be1725fa6cd8762d8..073582efe9c2838f83ae814cec941dd0214d673f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-82.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRVZ"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.183",
-      "mac": "",
+      "mac": "00:14:5e:55:68:85",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.183",
-      "mac": "",
+      "mac": "00:14:5e:55:68:86",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.184",
+      "mac": "00:14:5e:55:68:87",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-82-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
index 3e421ba3d20e61a940d6105918f92a13c7834857..9604fb8d6da3726625c4a905611950a0724c518d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-83.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRVY"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.184",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:23",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.184",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:24",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.185",
+      "mac": "00:14:5e:55:6d:25",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-83-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
index 6600f2b2d6182a0db76f8cb1397a79dfbf9e273a..d85cdbff84b9e817a8343592b353d81e7b042b87 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-84.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWR"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.185",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.185",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:49",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.186",
+      "mac": "00:14:5e:55:5c:4a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-84-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
index 1ae2df403cb89cccf7eb85c74ff249cb12f3a8cb..c3758684901065df37074c766c25dfeb0208a6cc 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-85.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYC"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.186",
-      "mac": "",
+      "mac": "00:14:5e:55:59:41",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.186",
-      "mac": "",
+      "mac": "00:14:5e:55:59:42",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.187",
+      "mac": "00:14:5e:55:59:43",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-85-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
index 7e6b7cbfb61b346f3148d03c8be11cdf2118ec99..97796ec023451fdd9a8dcb92054c5f3936456cb2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-86.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYK"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.187",
-      "mac": "",
+      "mac": "00:14:5e:55:68:ca",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.187",
-      "mac": "",
+      "mac": "00:14:5e:55:68:cb",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.188",
+      "mac": "00:14:5e:55:68:cc",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-86-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
index cd461d1c7a35378b0ecf96d8cdd75e4f1a6ff166..0615f6111fb9eb10cedc1a4158a64140727513d7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-87.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXC"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.188",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.188",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:29",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.189",
+      "mac": "00:14:5e:55:5e:2a",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-87-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
index ac56365e3dabbb7c0e2ad1dc2babccca9d2c3653..521917cf09bebaf164a944aee056e7747570c137 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-88.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXF"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.189",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:6b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.189",
-      "mac": "",
+      "mac": "00:14:5e:55:5d:6c",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.190",
+      "mac": "00:14:5e:55:5d:6d",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-88-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
index 5146358a7abd74d60df473d2a2153f8ef5d97bc8..daee0b4f48e8d137cd42465a7cdb0f818453de8a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-89.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWF"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.190",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:05",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.190",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:06",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.191",
+      "mac": "00:14:5e:55:6d:07",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-89-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
index 4d0ccf55e8d41ceb1dc0786150054587fca24f8f..556fcf5615a9fd04d436cbf574dbf82b1510aae5 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-9.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRXX"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.110",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:e8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.110",
-      "mac": "",
+      "mac": "00:14:5e:55:5e:e9",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.111",
+      "mac": "00:14:5e:55:5e:ea",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-9-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
index c77181c6d1664242ce90d51b8df705c8b243dbb1..6f6bf4ff07139a9a19331bde8c16f46f1db37d5f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-90.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(09/15/2008)",
+    "vendor": "IBM",
+    "version": "1.40-[C0E140AUS-1.40]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWG"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.191",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:29",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.191",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:2a",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.192",
+      "mac": "00:14:5e:55:6d:2b",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-90-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
index a8dbf3bcfa7d75d134f9c8ed5a3e938f8e285b2f..68a8f442be29f299f5b00aed32ceaefbe7182d4e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-91.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDTAB"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.192",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:c6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.192",
-      "mac": "",
+      "mac": "00:14:5e:55:5c:c7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.193",
+      "mac": "00:14:5e:55:5c:c8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-91-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
index 6ce0d2d258dfcec192545ff6f37f92dccc959ceb..78ff4b0c3f8c17006413115ed9a75600a0b58568 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-92.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRYD"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.193",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.193",
-      "mac": "",
+      "mac": "00:14:5e:55:6a:4b",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.194",
+      "mac": "00:14:5e:55:6a:4c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-92-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
index 7dd9c10cf6d927deb50abe5d74324497c2f6b018..d989630fb06f2eb7af71b3c2bab69c66c7b195d6 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordereau/nodes/bordereau-93.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 4
   },
+  "bios": {
+    "release_date": "(01/04/2007)",
+    "vendor": "IBM",
+    "version": "1.32-[C0E132AUS-1.32]-"
+  },
+  "chassis": {
+    "name": "IBM System x3455-[7986Z1J]-",
+    "serial": "KDDDRWP"
+  },
   "main_memory": {
     "ram_size": 4294967296,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.194",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.194",
-      "mac": "",
+      "mac": "00:14:5e:55:6d:15",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -38,14 +47,25 @@
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "BCM5704"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.195",
+      "mac": "00:14:5e:55:6d:16",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordereau-93-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "kadeploy_name": "debian-x64-5-prod",
-    "kadeploy_version": "1",
-    "name": "Debian Lenny",
-    "release": null,
-    "version": null
+    "Kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -61,11 +81,12 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "sata_svw",
       "interface": "SATA",
-      "size": 74505805969.2383,
-      "vendor": "Hitachi",
-      "version": "HDS72168"
+      "model": "HDS721680PLA380",
+      "rev": "P21OAB1A",
+      "size": 74505805969.2383
     }
   ],
   "supported_job_types": {
diff --git a/generators/input/bordeaux-bordereau.rb b/generators/input/bordeaux-bordereau.rb
index 1517d6fdcb1454ee53c0360f37fd42c872004572..c4e5c1bb498d2a0dd2a95584196e4ec3de27f181 100644
--- a/generators/input/bordeaux-bordereau.rb
+++ b/generators/input/bordeaux-bordereau.rb
@@ -3,56 +3,97 @@ site :bordeaux do |site_uid|
   cluster :bordereau do |cluster_uid|
     model "IBM System x3455"
     created_at Time.parse("2007-10-01 12:00 GMT").httpdate
-    misc "IPMI 2.0, BIOS Version 1.32"
+    misc "IPMI 2.0"
     93.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
         supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
         architecture({
-          :smp_size => 2,
-          :smt_size => 4,
-          :platform_type => "x86_64"
+          :smp_size 		=> 2,
+          :smt_size 		=> 4,
+          :platform_type	=> "x86_64"
           })
         processor({
-          :vendor => "AMD",
-          :model => "AMD Opteron",
-          :version => "2218",
-          :clock_speed => 2.6.G,
-          :instruction_set => "x86-64",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => 64.KiB,
-          :cache_l1d => 64.KiB,
-          :cache_l2 => 1.MiB
+          :vendor 		=> "AMD",
+          :model 		=> "AMD Opteron",
+          :version 		=> "2218",
+          :clock_speed 		=> 2.6.G,
+          :instruction_set 	=> "x86-64",
+          :other_description 	=> "",
+          :cache_l1 		=> nil,
+          :cache_l1i 		=> 64.KiB,
+          :cache_l1d 		=> 64.KiB,
+          :cache_l2 		=> 1.MiB
         })
         main_memory({
-          :ram_size => 4.GiB,
-          :virtual_size => nil
+          :ram_size 		=> 4.GiB,
+          :virtual_size 	=> nil
         })
         operating_system({
-	  :kadeploy_name => "debian-x64-5-prod",
-          :kadeploy_version => "1",
-          :name => "Debian Lenny",
-          :release => nil,
-          :version => nil
+	  :name 		=> "Debian",
+          :release 		=> "Lenny",
+          :version 		=> "5.0",
+          :Kernel 		=> "2.6.26"
+	})
+        storage_devices [{
+	  :interface 		=> 'SATA',
+	  :size 		=> 80.GB,
+	  :device		=> "sda",
+	  :driver 		=> "sata_svw",
+	  :model 		=> lookup('bordeaux-bordereau', node_uid, 'block_devices', 'sda', 'model'),
+	  :rev 			=> lookup('bordeaux-bordereau', node_uid, 'block_devices', 'sda', 'rev'),
+	}]
+        network_adapters [{
+	  :interface 		=> 'Ethernet',
+	  :rate 		=> 1.G,
+          :network_address 	=> "#{node_uid}.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-bordereau', node_uid, 'network_interfaces', 'eth0', 'ip'),
+	  :mac 			=> lookup('bordeaux-bordereau', node_uid, 'network_interfaces', 'eth0', 'mac'),
+	  :vendor 		=> "Broadcom",
+	  :version 		=> "BCM5704",
+          :enabled 		=> true,
+	  :mounted 		=> true,
+	  :mountable 		=> true,
+	  :driver 		=> "tg3",
+	  :management 		=> false,
+	  :device 		=> "eth0"
+	},
+        {
+	  :interface 		=> 'Ethernet',
+	  :rate 		=> 1.G,
+          :network_address 	=> "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-bordereau', node_uid, 'network_interfaces', 'eth1', 'ip'),
+	  :mac 			=> lookup('bordeaux-bordereau', node_uid, 'network_interfaces', 'eth1', 'mac'),
+	  :vendor 		=> "Broadcom",
+	  :version 		=> "BCM5704",
+          :enabled 		=> true,
+	  :mounted 		=> false,
+	  :mountable 		=> true,
+	  :driver 		=> "tg3",
+	  :management 		=> false,
+	  :device 		=> "eth1"
+	},
+	{
+	  :interface 		=> 'Ethernet',
+	  :rate 		=> 100.M,
+          :network_address 	=> "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+	  :ip 			=> lookup('bordeaux-bordereau', node_uid, 'network_interfaces', 'bmc', 'ip'),
+	  :mac 			=> lookup('bordeaux-bordereau', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :enabled 		=> true,
+	  :mounted 		=> false,
+	  :mountable 		=> false,
+	  :management 		=> true,
+	  :device 		=> "bmc"
+	}]
+	bios({
+	  :version              => lookup('bordeaux-bordereau', node_uid, 'bios', 'version'),
+	  :vendor               => lookup('bordeaux-bordereau', node_uid, 'bios', 'vendor'),
+	  :release_date         => lookup('bordeaux-bordereau', node_uid, 'bios', 'release_date')
+	})
+	chassis({
+	  :serial               => lookup('bordeaux-bordereau', node_uid, 'chassis', 'serial_number'),
+	  :name                 => lookup('bordeaux-bordereau', node_uid, 'chassis', 'product_name')
 	})
-        storage_devices [
-          {:interface => 'SATA', :size => 80.GB, :driver => "sata_svw", :vendor => "Hitachi", :version => "HDS72168"}
-          ]
-        network_adapters [
-          {:interface => 'Ethernet', :rate => 1.G,
-            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-	    :vendor => "Broadcom", :version => "BCM5704",
-            :enabled => true, :mounted => true, :mountable => true, :driver => "tg3", :management => false, :device => "eth0",
-	    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth0")},
-          {:interface => 'Ethernet', :rate => 1.G,
-            :network_address => "#{node_uid}-eth1.#{site_uid}.grid5000.fr", :ip => dns_lookup("#{node_uid}-eth1.#{site_uid}.grid5000.fr"),
-	    :vendor => "Broadcom", :version => "BCM5704",
-            :enabled => true, :mounted => false, :mountable => true, :driver => "tg3", :management => false, :device => "eth1",
-	    :mac => get_macaddr("#{node_uid}.#{site_uid}.grid5000.fr","eth1")}
-
-          ]
       end
     end
   end # cluster bordereau
-
 end
diff --git a/generators/input/bordeaux-bordereau.yaml b/generators/input/bordeaux-bordereau.yaml
index 09b39f92359a82a1b902d00985684d9b8764dc1a..4380a20dbd32b7ed8a3595a9b96e13103dd644f4 100644
--- a/generators/input/bordeaux-bordereau.yaml
+++ b/generators/input/bordeaux-bordereau.yaml
@@ -1,623 +1,2326 @@
+---
+bordereau-1:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac:
+      ip: 172.16.7.103
+    eth0:
+      mac:
+      ip: 172.16.1.102
+    eth1:
+      mac:
+      ip: 192.168.133.102
+bordereau-2:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:2e
+      ip: 172.16.7.104
+    eth0:
+      mac: 00:14:5e:55:5d:2c
+      ip: 172.16.1.103
+    eth1:
+      mac: 00:14:5e:55:5d:2d
+      ip: 192.168.133.103
+bordereau-3:
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZH
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:44
+      ip: 172.16.7.105
+    eth0:
+      mac: 00:14:5e:55:5c:42
+      ip: 172.16.1.104
+    eth1:
+      mac: 00:14:5e:55:5c:43
+      ip: 192.168.133.104
+bordereau-4:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5E:55:68:C9
+      ip: 172.16.7.106
+    eth0:
+      mac: 00:14:5e:55:68:c7
+      ip: 172.16.1.105
+    eth1:
+      mac: 00:14:5e:55:68:c8
+      ip: 192.168.133.105
+bordereau-5:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXT
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:61:96
+      ip: 172.16.7.107
+    eth0:
+      mac: 00:14:5e:55:61:94
+      ip: 172.16.1.106
+    eth1:
+      mac: 00:14:5e:55:61:95
+      ip: 192.168.133.106
+bordereau-6:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZM
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:58:f0
+      ip: 172.16.7.108
+    eth0:
+      mac: 00:14:5e:55:58:ee
+      ip: 172.16.1.107
+    eth1:
+      mac: 00:14:5e:55:58:ef
+      ip: 192.168.133.107
+bordereau-7:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRVP
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:7e
+      ip: 172.16.7.109
+    eth0:
+      mac: 00:14:5e:55:5e:7c
+      ip: 172.16.1.108
+    eth1:
+      mac: 00:14:5e:55:5e:7d
+      ip: 192.168.133.108
+bordereau-8:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRVT
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:60:fa
+      ip: 172.16.7.110
+    eth0:
+      mac: 00:14:5e:55:60:f8
+      ip: 172.16.1.109
+    eth1:
+      mac: 00:14:5e:55:60:f9
+      ip: 192.168.133.109
+bordereau-9:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXX
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:ea
+      ip: 172.16.7.111
+    eth0:
+      mac: 00:14:5e:55:5e:e8
+      ip: 172.16.1.110
+    eth1:
+      mac: 00:14:5e:55:5e:e9
+      ip: 192.168.133.110
 bordereau-10:
-  mac_eth0: 00:14:5e:55:6b:ca
-  ip_eth0: 172.16.1.111
-  mac_eth1: 00:14:5e:55:6b:cb
-  ip_eth1: 192.168.133.111
-  ip_mgt: 172.16.7.112
-  mac_mgt: 00:14:5E:55:6B:CC
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWH
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6b:cc
+      ip: 172.16.7.112
+    eth0:
+      mac: 00:14:5e:55:6b:ca
+      ip: 172.16.1.111
+    eth1:
+      mac: 00:14:5e:55:6b:cb
+      ip: 192.168.133.111
 bordereau-11:
-  mac_eth0: 00:14:5e:55:5c:81
-  ip_eth0: 172.16.1.112
-  mac_eth1: 00:14:5e:55:5c:82
-  ip_eth1: 192.168.133.112
-  ip_mgt: 172.16.7.113
-  mac_mgt: 00:14:5E:55:5C:83
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXW
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:83
+      ip: 172.16.7.113
+    eth0:
+      mac: 00:14:5e:55:5c:81
+      ip: 172.16.1.112
+    eth1:
+      mac: 00:14:5e:55:5c:82
+      ip: 192.168.133.112
 bordereau-12:
-  mac_eth0: 00:14:5e:55:58:f7
-  ip_eth0: 172.16.1.113
-  mac_eth1: 00:14:5e:55:58:f8
-  ip_eth1: 192.168.133.113
-  ip_mgt: 172.16.7.114
-  mac_mgt: 00:14:5E:55:58:F9
+  bios:
+    version: 1.30-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZR
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:58:f9
+      ip: 172.16.7.114
+    eth0:
+      mac: 00:14:5e:55:58:f7
+      ip: 172.16.1.113
+    eth1:
+      mac: 00:14:5e:55:58:f8
+      ip: 192.168.133.113
 bordereau-13:
-  mac_eth0: 00:14:5e:55:59:63
-  ip_eth0: 172.16.1.114
-  mac_eth1: 00:14:5e:55:59:64
-  ip_eth1: 192.168.133.114
-  ip_mgt: 172.16.7.115
-  mac_mgt: 00:14:5E:55:59:65
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXK
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:65
+      ip: 172.16.7.115
+    eth0:
+      mac: 00:14:5e:55:59:63
+      ip: 172.16.1.114
+    eth1:
+      mac: 00:14:5e:55:59:64
+      ip: 192.168.133.114
 bordereau-14:
-  mac_eth0: 00:14:5e:55:59:5d
-  ip_eth0: 172.16.1.115
-  mac_eth1: 00:14:5e:55:59:5e
-  ip_eth1: 192.168.133.115
-  ip_mgt: 172.16.7.116
-  mac_mgt: 00:14:5E:55:59:5F
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZF
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:5f
+      ip: 172.16.7.116
+    eth0:
+      mac: 00:14:5e:55:59:5d
+      ip: 172.16.1.115
+    eth1:
+      mac: 00:14:5e:55:59:5e
+      ip: 192.168.133.115
 bordereau-15:
-  mac_eth0: 00:14:5e:55:6a:f2
-  ip_eth0: 172.16.1.116
-  mac_eth1: 00:14:5e:55:6a:f3
-  ip_eth1: 192.168.133.116
-  ip_mgt: 172.16.7.117
-  mac_mgt: 00:14:5E:55:6A:F4
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWB
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6a:f4
+      ip: 172.16.7.117
+    eth0:
+      mac: 00:14:5e:55:6a:f2
+      ip: 172.16.1.116
+    eth1:
+      mac: 00:14:5e:55:6a:f3
+      ip: 192.168.133.116
 bordereau-16:
-  mac_eth0: 00:14:5e:55:5d:ec
-  ip_eth0: 172.16.1.117
-  mac_eth1: 00:14:5e:55:5d:ed
-  ip_eth1: 192.168.133.117
-  ip_mgt: 172.16.7.118
-  mac_mgt: 00:14:5E:55:5D:EE
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXD
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:ee
+      ip: 172.16.7.118
+    eth0:
+      mac: 00:14:5e:55:5d:ec
+      ip: 172.16.1.117
+    eth1:
+      mac: 00:14:5e:55:5d:ed
+      ip: 192.168.133.117
 bordereau-17:
-  mac_eth0: 00:14:5e:55:5e:a9
-  ip_eth0: 172.16.1.118
-  mac_eth1: 00:14:5e:55:5e:aa
-  ip_eth1: 192.168.133.118
-  ip_mgt: 172.16.7.119
-  mac_mgt: 00:14:5E:55:5E:AB
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYW
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:ab
+      ip: 172.16.7.119
+    eth0:
+      mac: 00:14:5e:55:5e:a9
+      ip: 172.16.1.118
+    eth1:
+      mac: 00:14:5e:55:5e:aa
+      ip: 192.168.133.118
 bordereau-18:
-  mac_eth0: 00:14:5e:55:64:0d
-  ip_eth0: 172.16.1.119
-  mac_eth1: 00:14:5e:55:64:0e
-  ip_eth1: 192.168.133.119
-  ip_mgt: 172.16.7.120
-  mac_mgt: 00:14:5E:55:64:0F
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYN
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:64:0f
+      ip: 172.16.7.120
+    eth0:
+      mac: 00:14:5e:55:64:0d
+      ip: 172.16.1.119
+    eth1:
+      mac: 00:14:5e:55:64:0e
+      ip: 192.168.133.119
 bordereau-19:
-  mac_eth0: 00:14:5e:55:68:67
-  ip_eth0: 172.16.1.120
-  mac_eth1: 00:14:5e:55:68:68
-  ip_eth1: 192.168.133.120
-  ip_mgt: 172.16.7.121
-  mac_mgt: 00:14:5E:55:68:69
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXN
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:68:69
+      ip: 172.16.7.121
+    eth0:
+      mac: 00:14:5e:55:68:67
+      ip: 172.16.1.120
+    eth1:
+      mac: 00:14:5e:55:68:68
+      ip: 192.168.133.120
 bordereau-20:
-  mac_eth0: 00:14:5e:55:62:b1
-  ip_eth0: 172.16.1.121
-  mac_eth1: 00:14:5e:55:62:b2
-  ip_eth1: 192.168.133.121
-  ip_mgt: 172.16.7.122
-  mac_mgt: 00:14:5E:55:62:B3
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXB
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:62:b3
+      ip: 172.16.7.122
+    eth0:
+      mac: 00:14:5e:55:62:b1
+      ip: 172.16.1.121
+    eth1:
+      mac: 00:14:5e:55:62:b2
+      ip: 192.168.133.121
 bordereau-21:
-  mac_eth0: 00:14:5e:55:5a:98
-  ip_eth0: 172.16.1.122
-  mac_eth1: 00:14:5e:55:5a:99
-  ip_eth1: 192.168.133.122
-  ip_mgt: 172.16.7.123
-  mac_mgt: 00:14:5E:55:5A:9A
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXV
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5a:9a
+      ip: 172.16.7.123
+    eth0:
+      mac: 00:14:5e:55:5a:98
+      ip: 172.16.1.122
+    eth1:
+      mac: 00:14:5e:55:5a:99
+      ip: 192.168.133.122
 bordereau-22:
-  mac_eth0: 00:14:5e:55:59:84
-  ip_eth0: 172.16.1.123
-  mac_eth1: 00:14:5e:55:59:85
-  ip_eth1: 192.168.133.123
-  ip_mgt: 172.16.7.124
-  mac_mgt: 00:14:5E:55:59:86
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWY
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:86
+      ip: 172.16.7.124
+    eth0:
+      mac: 00:14:5e:55:59:84
+      ip: 172.16.1.123
+    eth1:
+      mac: 00:14:5e:55:59:85
+      ip: 192.168.133.123
 bordereau-23:
-  mac_eth0: 00:14:5e:55:62:96
-  ip_eth0: 172.16.1.124
-  mac_eth1: 00:14:5e:55:62:97
-  ip_eth1: 192.168.133.124
-  ip_mgt: 172.16.7.125
-  mac_mgt: 00:14:5E:55:62:98
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWM
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:62:98
+      ip: 172.16.7.125
+    eth0:
+      mac: 00:14:5e:55:62:96
+      ip: 172.16.1.124
+    eth1:
+      mac: 00:14:5e:55:62:97
+      ip: 192.168.133.124
 bordereau-24:
-  mac_eth0: 00:14:5e:55:5d:da
-  ip_eth0: 172.16.1.125
-  mac_eth1: 00:14:5e:55:5d:db
-  ip_eth1: 192.168.133.125
-  ip_mgt: 172.16.7.126
-  mac_mgt: 00:14:5E:55:5D:DC
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAA
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:dc
+      ip: 172.16.7.126
+    eth0:
+      mac: 00:14:5e:55:5d:da
+      ip: 172.16.1.125
+    eth1:
+      mac: 00:14:5e:55:5d:db
+      ip: 192.168.133.125
 bordereau-25:
-  mac_eth0: 00:14:5e:55:5d:b9
-  ip_eth0: 172.16.1.126
-  mac_eth1: 00:14:5e:55:5d:ba
-  ip_eth1: 192.168.133.126
-  ip_mgt: 172.16.7.127
-  mac_mgt: 00:14:5E:55:5D:BB
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYT
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:bb
+      ip: 172.16.7.127
+    eth0:
+      mac: 00:14:5e:55:5d:b9
+      ip: 172.16.1.126
+    eth1:
+      mac: 00:14:5e:55:5d:ba
+      ip: 192.168.133.126
 bordereau-26:
-  mac_eth0: 00:14:5e:55:6d:2f
-  ip_eth0: 172.16.1.127
-  mac_eth1: 00:14:5e:55:6d:30
-  ip_eth1: 192.168.133.127
-  ip_mgt: 172.16.7.128
-  mac_mgt: 00:14:5E:55:6D:31
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRVW
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6d:31
+      ip: 172.16.7.128
+    eth0:
+      mac: 00:14:5e:55:6d:2f
+      ip: 172.16.1.127
+    eth1:
+      mac: 00:14:5e:55:6d:30
+      ip: 192.168.133.127
 bordereau-27:
-  mac_eth0: 00:14:5e:55:5c:69
-  ip_eth0: 172.16.1.128
-  mac_eth1: 00:14:5e:55:5c:6a
-  ip_eth1: 192.168.133.128
-  ip_mgt: 172.16.7.129
-  mac_mgt: 00:14:5E:55:5C:6B
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAG
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:6b
+      ip: 172.16.7.129
+    eth0:
+      mac: 00:14:5e:55:5c:69
+      ip: 172.16.1.128
+    eth1:
+      mac: 00:14:5e:55:5c:6a
+      ip: 192.168.133.128
 bordereau-28:
-  mac_eth0: 00:14:5e:55:5e:88
-  ip_eth0: 172.16.1.129
-  mac_eth1: 00:14:5e:55:5e:89
-  ip_eth1: 192.168.133.129
-  ip_mgt: 172.16.7.130
-  mac_mgt: 00:14:5E:55:5E:8A
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYZ
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:8a
+      ip: 172.16.7.130
+    eth0:
+      mac: 00:14:5e:55:5e:88
+      ip: 172.16.1.129
+    eth1:
+      mac: 00:14:5e:55:5e:89
+      ip: 192.168.133.129
 bordereau-29:
-  mac_eth0: 00:14:5e:55:5c:c3
-  ip_eth0: 172.16.1.130
-  mac_eth1: 00:14:5e:55:5c:c4
-  ip_eth1: 192.168.133.130
-  ip_mgt: 172.16.7.131
-  mac_mgt: 00:14:5E:55:5C:C5
-bordereau-2:
-  mac_eth0: 00:14:5e:55:5d:2c
-  ip_eth0: 172.16.1.103
-  mac_eth1: 00:14:5e:55:5d:2d
-  ip_eth1: 192.168.133.103
-  ip_mgt: 172.16.7.104
-  mac_mgt: 00:14:5E:55:5D:2E
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAH
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:c5
+      ip: 172.16.7.131
+    eth0:
+      mac: 00:14:5e:55:5c:c3
+      ip: 172.16.1.130
+    eth1:
+      mac: 00:14:5e:55:5c:c4
+      ip: 192.168.133.130
 bordereau-30:
-  mac_eth0: 00:14:5e:55:5e:d6
-  ip_eth0: 172.16.1.131
-  mac_eth1: 00:14:5e:55:5e:d7
-  ip_eth1: 192.168.133.131
-  ip_mgt: 172.16.7.132
-  mac_mgt: 00:14:5E:55:5E:D8
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:d8
+      ip: 172.16.7.132
+    eth0:
+      mac: 00:14:5e:55:5e:d6
+      ip: 172.16.1.131
+    eth1:
+      mac: 00:14:5e:55:5e:d7
+      ip: 192.168.133.131
 bordereau-31:
-  mac_eth0: 00:14:5e:55:59:b7
-  ip_eth0: 172.16.1.132
-  mac_eth1: 00:14:5e:55:59:b8
-  ip_eth1: 192.168.133.132
-  ip_mgt: 172.16.7.133
-  mac_mgt: 00:14:5E:55:59:B9
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWL
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:b9
+      ip: 172.16.7.133
+    eth0:
+      mac: 00:14:5e:55:59:b7
+      ip: 172.16.1.132
+    eth1:
+      mac: 00:14:5e:55:59:b8
+      ip: 192.168.133.132
 bordereau-32:
-  mac_eth0: 00:14:5e:55:59:bd
-  ip_eth0: 172.16.1.133
-  mac_eth1: 00:14:5e:55:59:be
-  ip_eth1: 192.168.133.133
-  ip_mgt: 172.16.7.134
-  mac_mgt: 00:14:5E:55:59:BF
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXA
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:bf
+      ip: 172.16.7.134
+    eth0:
+      mac: 00:14:5e:55:59:bd
+      ip: 172.16.1.133
+    eth1:
+      mac: 00:14:5e:55:59:be
+      ip: 192.168.133.133
 bordereau-33:
-  mac_eth0: 00:14:5e:55:5e:b2
-  ip_eth0: 172.16.1.134
-  mac_eth1: 00:14:5e:55:5e:b3
-  ip_eth1: 192.168.133.134
-  ip_mgt: 172.16.7.135
-  mac_mgt: 00:14:5E:55:5E:B4
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYH
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:b4
+      ip: 172.16.7.135
+    eth0:
+      mac: 00:14:5e:55:5e:b2
+      ip: 172.16.1.134
+    eth1:
+      mac: 00:14:5e:55:5e:b3
+      ip: 192.168.133.134
 bordereau-34:
-  mac_eth0: 00:14:5e:55:5d:02
-  ip_eth0: 172.16.1.135
-  mac_eth1: 00:14:5e:55:5d:03
-  ip_eth1: 192.168.133.135
-  ip_mgt: 172.16.7.136
-  mac_mgt: 00:14:5E:55:5D:04
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:04
+      ip: 172.16.7.136
+    eth0:
+      mac: 00:14:5e:55:5d:02
+      ip: 172.16.1.135
+    eth1:
+      mac: 00:14:5e:55:5d:03
+      ip: 192.168.133.135
 bordereau-35:
-  mac_eth0: 00:14:5e:55:5e:22
-  ip_eth0: 172.16.1.136
-  mac_eth1: 00:14:5e:55:5e:23
-  ip_eth1: 192.168.133.136
-  ip_mgt: 172.16.7.137
-  mac_mgt: 00:14:5E:55:5E:24
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZZ
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:24
+      ip: 172.16.7.137
+    eth0:
+      mac: 00:14:5e:55:5e:22
+      ip: 172.16.1.136
+    eth1:
+      mac: 00:14:5e:55:5e:23
+      ip: 192.168.133.136
 bordereau-36:
-  mac_eth0: 00:14:5e:55:69:f0
-  ip_eth0: 172.16.1.137
-  mac_eth1: 00:14:5e:55:69:f1
-  ip_eth1: 192.168.133.137
-  ip_mgt: 172.16.7.138
-  mac_mgt: 00:14:5E:55:69:F2
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAC
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:69:f2
+      ip: 172.16.7.138
+    eth0:
+      mac: 00:14:5e:55:69:f0
+      ip: 172.16.1.137
+    eth1:
+      mac: 00:14:5e:55:69:f1
+      ip: 192.168.133.137
 bordereau-37:
-  mac_eth0: 00:14:5e:55:5f:d2
-  ip_eth0: 172.16.1.138
-  mac_eth1: 00:14:5e:55:5f:d3
-  ip_eth1: 192.168.133.138
-  ip_mgt: 172.16.7.139
-  mac_mgt: 00:14:5E:55:5F:D4
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZL
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5f:d4
+      ip: 172.16.7.139
+    eth0:
+      mac: 00:14:5e:55:5f:d2
+      ip: 172.16.1.138
+    eth1:
+      mac: 00:14:5e:55:5f:d3
+      ip: 192.168.133.138
 bordereau-38:
-  mac_eth0: 00:14:5e:55:5f:0f
-  ip_eth0: 172.16.1.139
-  mac_eth1: 00:14:5e:55:5f:10
-  ip_eth1: 192.168.133.139
-  ip_mgt: 172.16.7.140
-  mac_mgt: 00:14:5E:55:5F:11
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZP
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5f:11
+      ip: 172.16.7.140
+    eth0:
+      mac: 00:14:5e:55:5f:0f
+      ip: 172.16.1.139
+    eth1:
+      mac: 00:14:5e:55:5f:10
+      ip: 192.168.133.139
 bordereau-39:
-  mac_eth0: 00:14:5e:55:63:2f
-  ip_eth0: 172.16.1.140
-  mac_eth1: 00:14:5e:55:63:30
-  ip_eth1: 192.168.133.140
-  ip_mgt: 172.16.7.141
-  mac_mgt: 00:14:5E:55:63:31
-bordereau-3:
-  mac_eth0: 00:14:5e:55:5c:42
-  ip_eth0: 172.16.1.104
-  mac_eth1: 00:14:5e:55:5c:43
-  ip_eth1: 192.168.133.104
-  ip_mgt: 172.16.7.105
-  mac_mgt: 00:14:5E:55:5C:44
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYG
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:63:31
+      ip: 172.16.7.141
+    eth0:
+      mac: 00:14:5e:55:63:2f
+      ip: 172.16.1.140
+    eth1:
+      mac: 00:14:5e:55:63:30
+      ip: 192.168.133.140
+bordereau-40:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac:
+      ip: 172.16.7.142
+    eth0:
+      mac:
+      ip: 172.16.1.141
+    eth1:
+      mac:
+      ip: 192.168.133.141
 bordereau-41:
-  mac_eth0: 00:14:5e:55:59:00
-  ip_eth0: 172.16.1.142
-  mac_eth1: 00:14:5e:55:59:01
-  ip_eth1: 192.168.133.142
-  ip_mgt: 172.16.7.143
-  mac_mgt: 00:14:5E:55:59:02
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:02
+      ip: 172.16.7.143
+    eth0:
+      mac: 00:14:5e:55:59:00
+      ip: 172.16.1.142
+    eth1:
+      mac: 00:14:5e:55:59:01
+      ip: 192.168.133.142
 bordereau-42:
-  mac_eth0: 00:14:5e:55:60:95
-  ip_eth0: 172.16.1.143
-  mac_eth1: 00:14:5e:55:60:96
-  ip_eth1: 192.168.133.143
-  ip_mgt: 172.16.7.144
-  mac_mgt: 00:14:5E:55:60:97
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYF
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:60:97
+      ip: 172.16.7.144
+    eth0:
+      mac: 00:14:5e:55:60:95
+      ip: 172.16.1.143
+    eth1:
+      mac: 00:14:5e:55:60:96
+      ip: 192.168.133.143
 bordereau-43:
-  mac_eth0: 00:14:5e:55:6c:00
-  ip_eth0: 172.16.1.144
-  mac_eth1: 00:14:5e:55:6c:01
-  ip_eth1: 192.168.133.144
-  ip_mgt: 172.16.7.145
-  mac_mgt: 00:14:5E:55:6C:02
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWD
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6c:02
+      ip: 172.16.7.145
+    eth0:
+      mac: 00:14:5e:55:6c:00
+      ip: 172.16.1.144
+    eth1:
+      mac: 00:14:5e:55:6c:01
+      ip: 192.168.133.144
 bordereau-44:
-  mac_eth0: 00:14:5e:55:59:d2
-  ip_eth0: 172.16.1.145
-  mac_eth1: 00:14:5e:55:59:d3
-  ip_eth1: 192.168.133.145
-  ip_mgt: 172.16.7.146
-  mac_mgt: 00:14:5E:55:59:D4
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXL
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:d4
+      ip: 172.16.7.146
+    eth0:
+      mac: 00:14:5e:55:59:d2
+      ip: 172.16.1.145
+    eth1:
+      mac: 00:14:5e:55:59:d3
+      ip: 192.168.133.145
 bordereau-45:
-  mac_eth0: 00:14:5e:55:5c:bd
-  ip_eth0: 172.16.1.146
-  mac_eth1: 00:14:5e:55:5c:be
-  ip_eth1: 192.168.133.146
-  ip_mgt: 172.16.7.147
-  mac_mgt: 00:14:5E:55:5C:BF
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWZ
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:bf
+      ip: 172.16.7.147
+    eth0:
+      mac: 00:14:5e:55:5c:bd
+      ip: 172.16.1.146
+    eth1:
+      mac: 00:14:5e:55:5c:be
+      ip: 192.168.133.146
 bordereau-46:
-  mac_eth0: 00:14:5e:55:5c:60
-  ip_eth0: 172.16.1.147
-  mac_eth1: 00:14:5e:55:5c:61
-  ip_eth1: 192.168.133.147
-  ip_mgt: 172.16.7.148
-  mac_mgt: 00:14:5E:55:5C:62
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYY
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:62
+      ip: 172.16.7.148
+    eth0:
+      mac: 00:14:5e:55:5c:60
+      ip: 172.16.1.147
+    eth1:
+      mac: 00:14:5e:55:5c:61
+      ip: 192.168.133.147
 bordereau-47:
-  mac_eth0: 00:14:5e:55:6c:a8
-  ip_eth0: 172.16.1.148
-  mac_eth1: 00:14:5e:55:6c:a9
-  ip_eth1: 192.168.133.148
-  ip_mgt: 172.16.7.149
-  mac_mgt: 00:14:5E:55:6C:AA
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWA
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6c:aa
+      ip: 172.16.7.149
+    eth0:
+      mac: 00:14:5e:55:6c:a8
+      ip: 172.16.1.148
+    eth1:
+      mac: 00:14:5e:55:6c:a9
+      ip: 192.168.133.148
 bordereau-48:
-  mac_eth0: 00:14:5e:55:58:fd
-  ip_eth0: 172.16.1.149
-  mac_eth1: 00:14:5e:55:58:fe
-  ip_eth1: 192.168.133.149
-  ip_mgt: 172.16.7.150
-  mac_mgt: 00:14:5E:55:58:FF
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZV
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:58:ff
+      ip: 172.16.7.150
+    eth0:
+      mac: 00:14:5e:55:58:fd
+      ip: 172.16.1.149
+    eth1:
+      mac: 00:14:5e:55:58:fe
+      ip: 192.168.133.149
 bordereau-49:
-  mac_eth0: 00:14:5e:55:62:e7
-  ip_eth0: 172.16.1.150
-  mac_eth1: 00:14:5e:55:62:e8
-  ip_eth1: 192.168.133.150
-  ip_mgt: 172.16.7.151
-  mac_mgt: 00:14:5E:55:62:E9
-bordereau-4:
-  mac_eth0: 00:14:5e:55:68:c7
-  ip_eth0: 172.16.1.105
-  mac_eth1: 00:14:5e:55:68:c8
-  ip_eth1: 192.168.133.105
-  ip_mgt: 172.16.7.106
-  mac_mgt: 00:14:5E:55:68:C9
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZA
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:62:d9
+      ip: 172.16.7.151
+    eth0:
+      mac: 00:14:5e:55:62:e7
+      ip: 172.16.1.150
+    eth1:
+      mac: 00:14:5e:55:62:e8
+      ip: 192.168.133.150
 bordereau-50:
-  mac_eth0: 00:14:5e:55:5e:ac
-  ip_eth0: 172.16.1.151
-  mac_eth1: 00:14:5e:55:5e:ad
-  ip_eth1: 192.168.133.151
-  ip_mgt: 172.16.7.152
-  mac_mgt: 00:14:5E:55:5E:AE
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYR
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:ae
+      ip: 172.16.7.152
+    eth0:
+      mac: 00:14:5e:55:5e:ac
+      ip: 172.16.1.151
+    eth1:
+      mac: 00:14:5e:55:5e:ad
+      ip: 192.168.133.151
 bordereau-51:
-  mac_eth0: 00:14:5e:55:5c:d5
-  ip_eth0: 172.16.1.152
-  mac_eth1: 00:14:5e:55:5c:d6
-  ip_eth1: 192.168.133.152
-  ip_mgt: 172.16.7.153
-  mac_mgt: 00:14:5E:55:5C:D7
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYA
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:d7
+      ip: 172.16.7.153
+    eth0:
+      mac: 00:14:5e:55:5c:d5
+      ip: 172.16.1.152
+    eth1:
+      mac: 00:14:5e:55:5c:d6
+      ip: 192.168.133.152
 bordereau-52:
-  mac_eth0: 00:14:5e:55:5d:b3
-  ip_eth0: 172.16.1.153
-  mac_eth1: 00:14:5e:55:5d:b4
-  ip_eth1: 192.168.133.153
-  ip_mgt: 172.16.7.154
-  mac_mgt: 00:14:5E:55:5D:B5
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYP
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:b5
+      ip: 172.16.7.154
+    eth0:
+      mac: 00:14:5e:55:5d:b3
+      ip: 172.16.1.153
+    eth1:
+      mac: 00:14:5e:55:5d:b4
+      ip: 192.168.133.153
 bordereau-53:
-  mac_eth0: 00:14:5e:55:6c:1b
-  ip_eth0: 172.16.1.154
-  mac_eth1: 00:14:5e:55:6c:1c
-  ip_eth1: 192.168.133.154
-  ip_mgt: 172.16.7.155
-  mac_mgt: 00:14:5E:55:6C:1D
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRVV
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6c:1d
+      ip: 172.16.7.155
+    eth0:
+      mac: 00:14:5e:55:6c:1b
+      ip: 172.16.1.154
+    eth1:
+      mac: 00:14:5e:55:6c:1c
+      ip: 192.168.133.154
 bordereau-54:
-  mac_eth0: 00:14:5e:55:63:b6
-  ip_eth0: 172.16.1.155
-  mac_eth1: 00:14:5e:55:63:b7
-  ip_eth1: 192.168.133.155
-  ip_mgt: 172.16.7.156
-  mac_mgt: 00:14:5E:55:63:B8
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZX
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:63:b8
+      ip: 172.16.7.156
+    eth0:
+      mac: 00:14:5e:55:63:b6
+      ip: 172.16.1.155
+    eth1:
+      mac: 00:14:5e:55:63:b7
+      ip: 192.168.133.155
 bordereau-55:
-  mac_eth0: 00:14:5e:55:5c:ed
-  ip_eth0: 172.16.1.156
-  mac_eth1: 00:14:5e:55:5c:ee
-  ip_eth1: 192.168.133.156
-  ip_mgt: 172.16.7.157
-  mac_mgt: 00:14:5E:55:5C:EF
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZY
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:ef
+      ip: 172.16.7.157
+    eth0:
+      mac: 00:14:5e:55:5c:ed
+      ip: 172.16.1.156
+    eth1:
+      mac: 00:14:5e:55:5c:ee
+      ip: 192.168.133.156
 bordereau-56:
-  mac_eth0: 00:14:5e:55:60:cb
-  ip_eth0: 172.16.1.157
-  mac_eth1: 00:14:5e:55:60:cc
-  ip_eth1: 192.168.133.157
-  ip_mgt: 172.16.7.158
-  mac_mgt: 00:14:5E:55:60:CD
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZT
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:60:cd
+      ip: 172.16.7.158
+    eth0:
+      mac: 00:14:5e:55:60:cb
+      ip: 172.16.1.157
+    eth1:
+      mac: 00:14:5e:55:60:cc
+      ip: 192.168.133.157
+bordereau-57:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac:
+      ip: 172.16.7.159
+    eth0:
+      mac:
+      ip: 172.16.1.158
+    eth1:
+      mac:
+      ip: 192.168.133.158
 bordereau-58:
-  mac_eth0: 00:14:5e:55:5e:a6
-  ip_eth0: 172.16.1.159
-  mac_eth1: 00:14:5e:55:5e:a7
-  ip_eth1: 192.168.133.159
-  ip_mgt: 172.16.7.160
-  mac_mgt: 00:14:5E:55:5E:A8
+  bios:
+    version: 1.35-[C0E135AUS-1.35]-
+    release_date: (02/26/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZC
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:a8
+      ip: 172.16.7.160
+    eth0:
+      mac: 00:14:5e:55:5e:a6
+      ip: 172.16.1.159
+    eth1:
+      mac: 00:14:5e:55:5e:a7
+      ip: 192.168.133.159
 bordereau-59:
-  mac_eth0: 00:14:5e:55:5c:d8
-  ip_eth0: 172.16.1.160
-  mac_eth1: 00:14:5e:55:5c:d9
-  ip_eth1: 192.168.133.160
-  ip_mgt: 172.16.7.161
-  mac_mgt: 00:14:5E:55:5C:DA
-bordereau-5:
-  mac_eth0: 00:14:5e:55:61:94
-  ip_eth0: 172.16.1.106
-  mac_eth1: 00:14:5e:55:61:95
-  ip_eth1: 192.168.133.106
-  ip_mgt: 172.16.7.107
-  mac_mgt: 00:14:5E:55:61:96
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZD
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:da
+      ip: 172.16.7.161
+    eth0:
+      mac: 00:14:5e:55:5c:d8
+      ip: 172.16.1.160
+    eth1:
+      mac: 00:14:5e:55:5c:d9
+      ip: 192.168.133.160
 bordereau-60:
-  mac_eth0: 00:14:5e:55:5b:5b
-  ip_eth0: 172.16.1.161
-  mac_eth1: 00:14:5e:55:5b:5c
-  ip_eth1: 192.168.133.161
-  ip_mgt: 172.16.7.162
-  mac_mgt: 00:14:5E:55:5B:5D
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZN
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5b:5d
+      ip: 172.16.7.162
+    eth0:
+      mac: 00:14:5e:55:5b:5b
+      ip: 172.16.1.161
+    eth1:
+      mac: 00:14:5e:55:5b:5c
+      ip: 192.168.133.161
 bordereau-61:
-  mac_eth0: 00:14:5e:55:58:49
-  ip_eth0: 172.16.1.162
-  mac_eth1: 00:14:5e:55:58:4a
-  ip_eth1: 192.168.133.162
-  ip_mgt: 172.16.7.163
-  mac_mgt: 00:14:5E:55:58:4B
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAL
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:58:4b
+      ip: 172.16.7.163
+    eth0:
+      mac: 00:14:5e:55:58:49
+      ip: 172.16.1.162
+    eth1:
+      mac: 00:14:5e:55:58:4a
+      ip: 192.168.133.162
 bordereau-62:
-  mac_eth0: 00:14:5e:55:63:26
-  ip_eth0: 172.16.1.163
-  mac_eth1: 00:14:5e:55:63:27
-  ip_eth1: 192.168.133.163
-  ip_mgt: 172.16.7.164
-  mac_mgt: 00:14:5E:55:63:28
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWT
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:63:28
+      ip: 172.16.7.164
+    eth0:
+      mac: 00:14:5e:55:63:26
+      ip: 172.16.1.163
+    eth1:
+      mac: 00:14:5e:55:63:27
+      ip: 192.168.133.163
 bordereau-63:
-  mac_eth0: 00:14:5e:55:5c:6c
-  ip_eth0: 172.16.1.164
-  mac_eth1: 00:14:5e:55:5c:6d
-  ip_eth1: 192.168.133.164
-  ip_mgt: 172.16.7.165
-  mac_mgt: 00:14:5E:55:5C:6E
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZB
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:6e
+      ip: 172.16.7.165
+    eth0:
+      mac: 00:14:5e:55:5c:6c
+      ip: 172.16.1.164
+    eth1:
+      mac: 00:14:5e:55:5c:6d
+      ip: 192.168.133.164
 bordereau-64:
-  mac_eth0: 00:14:5e:55:5c:cf
-  ip_eth0: 172.16.1.165
-  mac_eth1: 00:14:5e:55:5c:d0
-  ip_eth1: 192.168.133.165
-  ip_mgt: 172.16.7.166
-  mac_mgt: 00:14:5E:55:5C:D1
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAD
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:d1
+      ip: 172.16.7.166
+    eth0:
+      mac: 00:14:5e:55:5c:cf
+      ip: 172.16.1.165
+    eth1:
+      mac: 00:14:5e:55:5c:d0
+      ip: 192.168.133.165
 bordereau-65:
-  mac_eth0: 00:14:5e:55:59:f9
-  ip_eth0: 172.16.1.166
-  mac_eth1: 00:14:5e:55:59:fa
-  ip_eth1: 192.168.133.166
-  ip_mgt: 172.16.7.167
-  mac_mgt: 00:14:5E:55:59:FB
+  bios:
+    version: 1.35-[C0E135AUS-1.35]-
+    release_date: (02/26/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWX
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:fb
+      ip: 172.16.7.167
+    eth0:
+      mac: 00:14:5e:55:59:f9
+      ip: 172.16.1.166
+    eth1:
+      mac: 00:14:5e:55:59:fa
+      ip: 192.168.133.166
 bordereau-66:
-  mac_eth0: 00:14:5e:55:5e:19
-  ip_eth0: 172.16.1.167
-  mac_eth1: 00:14:5e:55:5e:1a
-  ip_eth1: 192.168.133.167
-  ip_mgt: 172.16.7.168
-  mac_mgt: 00:14:5E:55:5E:1B
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYX
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:1b
+      ip: 172.16.7.168
+    eth0:
+      mac: 00:14:5e:55:5e:19
+      ip: 172.16.1.167
+    eth1:
+      mac: 00:14:5e:55:5e:1a
+      ip: 192.168.133.167
 bordereau-67:
-  mac_eth0: 00:14:5e:55:5c:1b
-  ip_eth0: 172.16.1.168
-  mac_eth1: 00:14:5e:55:5c:1c
-  ip_eth1: 192.168.133.168
-  ip_mgt: 172.16.7.169
-  mac_mgt: 00:14:5E:55:5C:1D
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZW
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:1d
+      ip: 172.16.7.169
+    eth0:
+      mac: 00:14:5e:55:5c:1b
+      ip: 172.16.1.168
+    eth1:
+      mac: 00:14:5e:55:5c:1c
+      ip: 192.168.133.168
+bordereau-68:
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXZ
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:57:8b
+      ip: 172.16.7.170
+    eth0:
+      mac: 00:14:5e:55:57:89
+      ip: 172.16.1.169
+    eth1:
+      mac: 00:14:5e:55:57:8a
+      ip: 192.168.133.169
 bordereau-69:
-  mac_eth0: 00:14:5e:55:63:ce
-  ip_eth0: 172.16.1.170
-  mac_eth1: 00:14:5e:55:63:cf
-  ip_eth1: 192.168.133.170
-  ip_mgt: 172.16.7.171
-  mac_mgt: 00:14:5E:55:63:D0
-bordereau-6:
-  mac_eth0: 00:14:5e:55:58:ee
-  ip_eth0: 172.16.1.107
-  mac_eth1: 00:14:5e:55:58:ef
-  ip_eth1: 192.168.133.107
-  ip_mgt: 172.16.7.108
-  mac_mgt: 00:14:5E:55:58:F0
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWW
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:63:d0
+      ip: 172.16.7.171
+    eth0:
+      mac: 00:14:5e:55:63:ce
+      ip: 172.16.1.170
+    eth1:
+      mac: 00:14:5e:55:63:cf
+      ip: 192.168.133.170
 bordereau-70:
-  mac_eth0: 00:14:5e:55:6a:fe
-  ip_eth0: 172.16.1.171
-  mac_eth1: 00:14:5e:55:6a:ff
-  ip_eth1: 192.168.133.171
-  ip_mgt: 172.16.7.172
-  mac_mgt: 00:14:5E:55:6B:00
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWC
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6b:00
+      ip: 172.16.7.172
+    eth0:
+      mac: 00:14:5e:55:6a:fe
+      ip: 172.16.1.171
+    eth1:
+      mac: 00:14:5e:55:6a:ff
+      ip: 192.168.133.171
 bordereau-71:
-  mac_eth0: 00:14:5e:55:59:44
-  ip_eth0: 172.16.1.172
-  mac_eth1: 00:14:5e:55:59:45
-  ip_eth1: 192.168.133.172
-  ip_mgt: 172.16.7.173
-  mac_mgt: 00:14:5E:55:59:46
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRZK
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:46
+      ip: 172.16.7.173
+    eth0:
+      mac: 00:14:5e:55:59:44
+      ip: 172.16.1.172
+    eth1:
+      mac: 00:14:5e:55:59:45
+      ip: 192.168.133.172
 bordereau-72:
-  mac_eth0: 00:14:5e:55:5a:3e
-  ip_eth0: 172.16.1.173
-  mac_eth1: 00:14:5e:55:5a:3f
-  ip_eth1: 192.168.133.173
-  ip_mgt: 172.16.7.174
-  mac_mgt: 00:14:5E:55:5A:40
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXM
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5a:40
+      ip: 172.16.7.174
+    eth0:
+      mac: 00:14:5e:55:5a:3e
+      ip: 172.16.1.173
+    eth1:
+      mac: 00:14:5e:55:5a:3f
+      ip: 192.168.133.173
 bordereau-73:
-  mac_eth0: 00:14:5e:55:6a:1a
-  ip_eth0: 172.16.1.174
-  mac_eth1: 00:14:5e:55:6a:1b
-  ip_eth1: 192.168.133.174
-  ip_mgt: 172.16.7.175
-  mac_mgt: 00:14:5E:55:6A:1C
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAK
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6a:1c
+      ip: 172.16.7.175
+    eth0:
+      mac: 00:14:5e:55:6a:1a
+      ip: 172.16.1.174
+    eth1:
+      mac: 00:14:5e:55:6a:1b
+      ip: 192.168.133.174
 bordereau-74:
-  mac_eth0: 00:14:5e:55:64:04
-  ip_eth0: 172.16.1.175
-  mac_eth1: 00:14:5e:55:64:05
-  ip_eth1: 192.168.133.175
-  ip_mgt: 172.16.7.176
-  mac_mgt: 00:14:5E:55:64:06
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYM
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:64:06
+      ip: 172.16.7.176
+    eth0:
+      mac: 00:14:5e:55:64:04
+      ip: 172.16.1.175
+    eth1:
+      mac: 00:14:5e:55:64:05
+      ip: 192.168.133.175
 bordereau-75:
-  mac_eth0: 00:14:5e:55:5e:af
-  ip_eth0: 172.16.1.176
-  mac_eth1: 00:14:5e:55:5e:b0
-  ip_eth1: 192.168.133.176
-  ip_mgt: 172.16.7.177
-  mac_mgt: 00:14:5E:55:5E:B1
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWV
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:b1
+      ip: 172.16.7.177
+    eth0:
+      mac: 00:14:5e:55:5e:af
+      ip: 172.16.1.176
+    eth1:
+      mac: 00:14:5e:55:5e:b0
+      ip: 192.168.133.176
 bordereau-76:
-  mac_eth0: 00:14:5e:55:5d:08
-  ip_eth0: 172.16.1.177
-  mac_eth1: 00:14:5e:55:5d:09
-  ip_eth1: 192.168.133.177
-  ip_mgt: 172.16.7.178
-  mac_mgt: 00:14:5E:55:5D:0A
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAF
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:0a
+      ip: 172.16.7.178
+    eth0:
+      mac: 00:14:5e:55:5d:08
+      ip: 172.16.1.177
+    eth1:
+      mac: 00:14:5e:55:5d:09
+      ip: 192.168.133.177
 bordereau-77:
-  mac_eth0: 00:14:5e:55:63:5f
-  ip_eth0: 172.16.1.178
-  mac_eth1: 00:14:5e:55:63:60
-  ip_eth1: 192.168.133.178
-  ip_mgt: 172.16.7.179
-  mac_mgt: 00:14:5E:55:63:61
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWN
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:63:61
+      ip: 172.16.7.179
+    eth0:
+      mac: 00:14:5e:55:63:5f
+      ip: 172.16.1.178
+    eth1:
+      mac: 00:14:5e:55:63:60
+      ip: 192.168.133.178
 bordereau-78:
-  mac_eth0: 00:14:5e:55:63:fb
-  ip_eth0: 172.16.1.179
-  mac_eth1: 00:14:5e:55:63:fc
-  ip_eth1: 192.168.133.179
-  ip_mgt: 172.16.7.180
-  mac_mgt: 00:14:5E:55:63:FD
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXP
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:63:fd
+      ip: 172.16.7.180
+    eth0:
+      mac: 00:14:5e:55:63:fb
+      ip: 172.16.1.179
+    eth1:
+      mac: 00:14:5e:55:63:fc
+      ip: 192.168.133.179
 bordereau-79:
-  mac_eth0: 00:14:5e:55:62:ed
-  ip_eth0: 172.16.1.180
-  mac_eth1: 00:14:5e:55:62:ee
-  ip_eth1: 192.168.133.180
-  ip_mgt: 172.16.7.181
-  mac_mgt: 00:14:5E:55:62:EF
-bordereau-7:
-  mac_eth0: 00:14:5e:55:5e:7c
-  ip_eth0: 172.16.1.108
-  mac_eth1: 00:14:5e:55:5e:7d
-  ip_eth1: 192.168.133.108
-  ip_mgt: 172.16.7.109
-  mac_mgt: 00:14:5E:55:5E:7E
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number:
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:62:ef
+      ip: 172.16.7.181
+    eth0:
+      mac: 00:14:5e:55:62:ed
+      ip: 172.16.1.180
+    eth1:
+      mac: 00:14:5e:55:62:ee
+      ip: 192.168.133.180
 bordereau-80:
-  mac_eth0: 00:14:5e:55:5c:ae
-  ip_eth0: 172.16.1.181
-  mac_eth1: 00:14:5e:55:5c:af
-  ip_eth1: 192.168.133.181
-  ip_mgt: 172.16.7.182
-  mac_mgt: 00:14:5E:55:5C:B0
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYL
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:b0
+      ip: 172.16.7.182
+    eth0:
+      mac: 00:14:5e:55:5c:ae
+      ip: 172.16.1.181
+    eth1:
+      mac: 00:14:5e:55:5c:af
+      ip: 192.168.133.181
 bordereau-81:
-  mac_eth0: 00:14:5e:55:58:a6
-  ip_eth0: 172.16.1.182
-  mac_eth1: 00:14:5e:55:58:a7
-  ip_eth1: 192.168.133.182
-  ip_mgt: 172.16.7.183
-  mac_mgt: 00:14:5E:55:58:A8
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYV
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:58:a8
+      ip: 172.16.7.183
+    eth0:
+      mac: 00:14:5e:55:58:a6
+      ip: 172.16.1.182
+    eth1:
+      mac: 00:14:5e:55:58:a7
+      ip: 192.168.133.182
 bordereau-82:
-  mac_eth0: 00:14:5e:55:68:85
-  ip_eth0: 172.16.1.183
-  mac_eth1: 00:14:5e:55:68:86
-  ip_eth1: 192.168.133.183
-  ip_mgt: 172.16.7.184
-  mac_mgt: 00:14:5E:55:68:87
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRVZ
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:68:87
+      ip: 172.16.7.184
+    eth0:
+      mac: 00:14:5e:55:68:85
+      ip: 172.16.1.183
+    eth1:
+      mac: 00:14:5e:55:68:86
+      ip: 192.168.133.183
 bordereau-83:
-  mac_eth0: 00:14:5e:55:6d:23
-  ip_eth0: 172.16.1.184
-  mac_eth1: 00:14:5e:55:6d:24
-  ip_eth1: 192.168.133.184
-  ip_mgt: 172.16.7.185
-  mac_mgt: 00:14:5E:55:6D:25
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRVY
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6d:25
+      ip: 172.16.7.185
+    eth0:
+      mac: 00:14:5e:55:6d:23
+      ip: 172.16.1.184
+    eth1:
+      mac: 00:14:5e:55:6d:24
+      ip: 192.168.133.184
 bordereau-84:
-  mac_eth0: 00:14:5e:55:5c:48
-  ip_eth0: 172.16.1.185
-  mac_eth1: 00:14:5e:55:5c:49
-  ip_eth1: 192.168.133.185
-  ip_mgt: 172.16.7.186
-  mac_mgt: 00:14:5E:55:5C:4A
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWR
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:4a
+      ip: 172.16.7.186
+    eth0:
+      mac: 00:14:5e:55:5c:48
+      ip: 172.16.1.185
+    eth1:
+      mac: 00:14:5e:55:5c:49
+      ip: 192.168.133.185
 bordereau-85:
-  mac_eth0: 00:14:5e:55:59:41
-  ip_eth0: 172.16.1.186
-  mac_eth1: 00:14:5e:55:59:42
-  ip_eth1: 192.168.133.186
-  ip_mgt: 172.16.7.187
-  mac_mgt: 00:14:5E:55:59:43
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYC
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:59:43
+      ip: 172.16.7.187
+    eth0:
+      mac: 00:14:5e:55:59:41
+      ip: 172.16.1.186
+    eth1:
+      mac: 00:14:5e:55:59:42
+      ip: 192.168.133.186
 bordereau-86:
-  mac_eth0: 00:14:5e:55:68:ca
-  ip_eth0: 172.16.1.187
-  mac_eth1: 00:14:5e:55:68:cb
-  ip_eth1: 192.168.133.187
-  ip_mgt: 172.16.7.188
-  mac_mgt: 00:14:5E:55:68:CC
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYK
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:68:cc
+      ip: 172.16.7.188
+    eth0:
+      mac: 00:14:5e:55:68:ca
+      ip: 172.16.1.187
+    eth1:
+      mac: 00:14:5e:55:68:cb
+      ip: 192.168.133.187
 bordereau-87:
-  mac_eth0: 00:14:5e:55:5e:28
-  ip_eth0: 172.16.1.188
-  mac_eth1: 00:14:5e:55:5e:29
-  ip_eth1: 192.168.133.188
-  ip_mgt: 172.16.7.189
-  mac_mgt: 00:14:5E:55:5E:2A
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXC
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5e:2a
+      ip: 172.16.7.189
+    eth0:
+      mac: 00:14:5e:55:5e:28
+      ip: 172.16.1.188
+    eth1:
+      mac: 00:14:5e:55:5e:29
+      ip: 192.168.133.188
 bordereau-88:
-  mac_eth0: 00:14:5e:55:5d:6b
-  ip_eth0: 172.16.1.189
-  mac_eth1: 00:14:5e:55:5d:6c
-  ip_eth1: 192.168.133.189
-  ip_mgt: 172.16.7.190
-  mac_mgt: 00:14:5E:55:5D:6D
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRXF
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5d:6d
+      ip: 172.16.7.190
+    eth0:
+      mac: 00:14:5e:55:5d:6b
+      ip: 172.16.1.189
+    eth1:
+      mac: 00:14:5e:55:5d:6c
+      ip: 192.168.133.189
 bordereau-89:
-  mac_eth0: 00:14:5e:55:6d:05
-  ip_eth0: 172.16.1.190
-  mac_eth1: 00:14:5e:55:6d:06
-  ip_eth1: 192.168.133.190
-  ip_mgt: 172.16.7.191
-  mac_mgt: 00:14:5E:55:6D:07
-bordereau-8:
-  mac_eth0: 00:14:5e:55:60:f8
-  ip_eth0: 172.16.1.109
-  mac_eth1: 00:14:5e:55:60:f9
-  ip_eth1: 192.168.133.109
-  ip_mgt: 172.16.7.110
-  mac_mgt: 00:14:5E:55:60:FA
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWF
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6d:07
+      ip: 172.16.7.191
+    eth0:
+      mac: 00:14:5e:55:6d:05
+      ip: 172.16.1.190
+    eth1:
+      mac: 00:14:5e:55:6d:06
+      ip: 192.168.133.190
 bordereau-90:
-  mac_eth0: 00:14:5e:55:6d:29
-  ip_eth0: 172.16.1.191
-  mac_eth1: 00:14:5e:55:6d:2a
-  ip_eth1: 192.168.133.191
-  ip_mgt: 172.16.7.192
-  mac_mgt: 00:14:5E:55:6D:2B
+  bios:
+    version: 1.40-[C0E140AUS-1.40]-
+    release_date: (09/15/2008)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWG
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6d:2b
+      ip: 172.16.7.192
+    eth0:
+      mac: 00:14:5e:55:6d:29
+      ip: 172.16.1.191
+    eth1:
+      mac: 00:14:5e:55:6d:2a
+      ip: 192.168.133.191
 bordereau-91:
-  mac_eth0: 00:14:5e:55:5c:c6
-  ip_eth0: 172.16.1.192
-  mac_eth1: 00:14:5e:55:5c:c7
-  ip_eth1: 192.168.133.192
-  ip_mgt: 172.16.7.193
-  mac_mgt: 00:14:5E:55:5C:C8
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDTAB
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:5c:c8
+      ip: 172.16.7.193
+    eth0:
+      mac: 00:14:5e:55:5c:c6
+      ip: 172.16.1.192
+    eth1:
+      mac: 00:14:5e:55:5c:c7
+      ip: 192.168.133.192
 bordereau-92:
-  mac_eth0: 00:14:5e:55:6a:4a
-  ip_eth0: 172.16.1.193
-  mac_eth1: 00:14:5e:55:6a:4b
-  ip_eth1: 192.168.133.193
-  ip_mgt: 172.16.7.194
-  mac_mgt: 00:14:5E:55:6A:4C
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRYD
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6a:4c
+      ip: 172.16.7.194
+    eth0:
+      mac: 00:14:5e:55:6a:4a
+      ip: 172.16.1.193
+    eth1:
+      mac: 00:14:5e:55:6a:4b
+      ip: 192.168.133.193
 bordereau-93:
-  mac_eth0: 00:14:5e:55:6d:14
-  ip_eth0: 172.16.1.194
-  mac_eth1: 00:14:5e:55:6d:15
-  ip_eth1: 192.168.133.194
-  ip_mgt: 172.16.7.195
-  mac_mgt: 00:14:5E:55:6D:16
-bordereau-9:
-  mac_eth0: 00:14:5e:55:5e:e8
-  ip_eth0: 172.16.1.110
-  mac_eth1: 00:14:5e:55:5e:e9
-  ip_eth1: 192.168.133.110
-  ip_mgt: 172.16.7.111
-  mac_mgt: 00:14:5E:55:5E:EA
+  bios:
+    version: 1.32-[C0E132AUS-1.32]-
+    release_date: (01/04/2007)
+    vendor: IBM
+  block_devices:
+    sda:
+      model: HDS721680PLA380
+      size:
+      rev: P21OAB1A
+      vendor: Hitachi
+  chassis:
+      serial_number: KDDDRWP
+      manufacturer: IBM
+      product_name: IBM System x3455-[7986Z1J]-
+  network_interfaces:
+    bmc:
+      mac: 00:14:5e:55:6d:16
+      ip: 172.16.7.195
+    eth0:
+      mac: 00:14:5e:55:6d:14
+      ip: 172.16.1.194
+    eth1:
+      mac: 00:14:5e:55:6d:15
+      ip: 192.168.133.194
diff --git a/generators/input/bordeaux.yaml b/generators/input/bordeaux.yaml
deleted file mode 100644
index a6b64249667bb9e8583c573c6a57b33ae631fcdd..0000000000000000000000000000000000000000
--- a/generators/input/bordeaux.yaml
+++ /dev/null
@@ -1,1062 +0,0 @@
-bordeplage-10:
-  mac_eth0: 00:14:22:0c:da:76
-  ip_eth0: 172.16.1.60
-  mac_eth1: 00:14:22:0c:da:77
-  ip_eth1: 192.168.133.60
-  mac_ib0: ad:00:00:02:b6:62
-  ip_ib0: 192.168.132.10
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.60
-bordeplage-11:
-  mac_eth0: 00:14:22:0c:d9:bc
-  ip_eth0: 172.16.1.61
-  mac_eth1: 00:14:22:0c:d9:bd
-  ip_eth1: 192.168.133.61
-  mac_ib0: ad:00:00:01:5a:29
-  ip_ib0: 192.168.132.11
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.61
-bordeplage-12:
-  mac_eth0: 00:14:22:0c:da:74
-  ip_eth0: 172.16.1.62
-  mac_eth1: 00:14:22:0c:da:75
-  ip_eth1: 192.168.133.62
-  mac_ib0: ad:00:00:01:5a:3d
-  ip_ib0: 192.168.132.12
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.62
-bordeplage-13:
-  mac_eth0: 00:14:22:0c:da:82
-  ip_eth0: 172.16.1.63
-  mac_eth1: 00:14:22:0c:da:83
-  ip_eth1: 192.168.133.63
-  mac_ib0: ad:00:00:02:b6:7a
-  ip_ib0: 192.168.132.13
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.63
-bordeplage-14:
-  mac_eth0: 00:14:22:0c:da:90
-  ip_eth0: 172.16.1.64
-  mac_eth1: 00:14:22:0c:da:91
-  ip_eth1: 192.168.133.64
-  mac_ib0: ad:00:00:01:5a:51
-  ip_ib0: 192.168.132.14
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-16:
-  mac_eth0: 00:14:22:0c:da:44
-  ip_eth0: 172.16.1.66
-  mac_eth1: 00:14:22:0c:da:45
-  ip_eth1: 192.168.133.66
-  mac_ib0: ad:00:00:02:a5:73
-  ip_ib0: 192.168.132.16
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.66
-bordeplage-17:
-  mac_eth0: 00:14:22:0c:da:62
-  ip_eth0: 172.16.1.67
-  mac_eth1: 00:14:22:0c:da:63
-  ip_eth1: 192.168.133.67
-  mac_ib0: ad:00:00:01:62:c4
-  ip_ib0: 192.168.132.17
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.67
-bordeplage-18:
-  mac_eth0: 00:14:22:0c:da:a2
-  ip_eth0: 172.16.1.68
-  mac_eth1: 00:14:22:0c:da:a3
-  ip_eth1: 192.168.133.68
-  mac_ib0: ad:00:00:01:61:08
-  ip_ib0: 192.168.132.18
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.68
-bordeplage-19:
-  mac_eth0: 00:14:22:0c:b4:00
-  ip_eth0: 172.16.1.69
-  mac_eth1: 00:14:22:0c:b4:01
-  ip_eth1: 192.168.133.69
-  mac_ib0: ad:00:00:01:62:b4
-  ip_ib0: 192.168.132.19
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.69
-bordeplage-1:
-  mac_eth0: 00:14:22:0c:d9:ec
-  ip_eth0: 172.16.1.51
-  mac_eth1: 00:14:22:0c:d9:ed
-  ip_eth1: 192.168.133.51
-  mac_ib0: ad:00:00:02:9d:55
-  ip_ib0: 192.168.132.1
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.51
-bordeplage-20:
-  mac_eth0: 00:14:22:0c:b3:1c
-  ip_eth0: 172.16.1.70
-  mac_eth1: 00:14:22:0c:b3:1d
-  ip_eth1: 192.168.133.70
-  mac_ib0: ad:00:00:01:62:b8
-  ip_ib0: 192.168.132.20
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.70
-bordeplage-21:
-  mac_eth0: 00:14:22:0c:e1:48
-  ip_eth0: 172.16.1.71
-  mac_eth1: 00:14:22:0c:e1:49
-  ip_eth1: 192.168.133.71
-  mac_ib0: ad:00:00:01:5a:19
-  ip_ib0: 192.168.132.21
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-22:
-  mac_eth0: 00:14:22:0c:dd:02
-  ip_eth0: 172.16.1.72
-  mac_eth1: 00:14:22:0c:dd:03
-  ip_eth1: 192.168.133.72
-  mac_ib0: ad:00:00:01:5a:41
-  ip_ib0: 192.168.132.22
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.72
-bordeplage-23:
-  mac_eth0: 00:14:22:0c:e1:4c
-  ip_eth0: 172.16.1.73
-  mac_eth1: 00:14:22:0c:e1:4d
-  ip_eth1: 192.168.133.73
-  mac_ib0: ad:00:00:01:62:88
-  ip_ib0: 192.168.132.23
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.73
-bordeplage-24:
-  mac_eth0: 00:14:22:0c:e0:e0
-  ip_eth0: 172.16.1.74
-  mac_eth1: 00:14:22:0c:e0:e1
-  ip_eth1: 192.168.133.74
-  mac_ib0: ad:00:00:01:61:ec
-  ip_ib0: 192.168.132.24
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.74
-bordeplage-25:
-  mac_eth0: 00:14:22:0c:e1:76
-  ip_eth0: 172.16.1.75
-  mac_eth1: 00:14:22:0c:e1:77
-  ip_eth1: 192.168.133.75
-  mac_ib0: ad:00:00:02:a4:4a
-  ip_ib0: 192.168.132.25
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-26:
-  mac_eth0: 00:14:22:0c:e1:52
-  ip_eth0: 172.16.1.76
-  mac_eth1: 00:14:22:0c:e1:53
-  ip_eth1: 192.168.133.76
-  mac_ib0: ad:00:00:01:62:94
-  ip_ib0: 192.168.132.26
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-27:
-  mac_eth0: 00:14:22:0c:e1:7e
-  ip_eth0: 172.16.1.77
-  mac_eth1: 00:14:22:0c:e1:7f
-  ip_eth1: 192.168.133.77
-  mac_ib0: ad:00:00:01:5a:55
-  ip_ib0: 192.168.132.27
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.77
-bordeplage-28:
-  mac_eth0: 00:14:22:0c:e1:8c
-  ip_eth0: 172.16.1.78
-  mac_eth1: 00:14:22:0c:e1:8d
-  ip_eth1: 192.168.133.78
-  mac_ib0: ad:00:00:01:62:98
-  ip_ib0: 192.168.132.28
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-29:
-  mac_eth0: 00:14:22:0c:e1:0a
-  ip_eth0: 172.16.1.79
-  mac_eth1: 00:14:22:0c:e1:0b
-  ip_eth1: 192.168.133.79
-  mac_ib0: ad:00:00:01:5a:39
-  ip_ib0: 192.168.132.29
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.79
-bordeplage-2:
-  mac_eth0: 00:14:22:0c:da:46
-  ip_eth0: 172.16.1.52
-  mac_eth1: 00:14:22:0c:da:47
-  ip_eth1: 192.168.133.52
-  mac_ib0: ad:00:00:01:62:24
-  ip_ib0: 192.168.132.2
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.52
-bordeplage-30:
-  mac_eth0: 00:14:22:0c:e1:92
-  ip_eth0: 172.16.1.80
-  mac_eth1: 00:14:22:0c:e1:93
-  ip_eth1: 192.168.133.80
-  mac_ib0: ad:00:00:01:61:fc
-  ip_ib0: 192.168.132.30
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.80
-bordeplage-32:
-  mac_eth0: 00:14:22:0c:da:b6
-  ip_eth0: 172.16.1.82
-  mac_eth1: 00:14:22:0c:da:b7
-  ip_eth1: 192.168.133.82
-  mac_ib0: ad:00:00:02:a5:97
-  ip_ib0: 192.168.132.32
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.82
-bordeplage-33:
-  mac_eth0: 00:14:22:0c:da:94
-  ip_eth0: 172.16.1.83
-  mac_eth1: 00:14:22:0c:da:95
-  ip_eth1: 192.168.133.83
-  mac_ib0: ad:00:00:01:5a:75
-  ip_ib0: 192.168.132.33
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.83
-bordeplage-34:
-  mac_eth0: 00:14:22:0c:da:12
-  ip_eth0: 172.16.1.84
-  mac_eth1: 00:14:22:0c:da:13
-  ip_eth1: 192.168.133.84
-  mac_ib0: ad:00:00:01:62:68
-  ip_ib0: 192.168.132.34
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.84
-bordeplage-35:
-  mac_eth0: 00:14:22:0c:e1:36
-  ip_eth0: 172.16.1.85
-  mac_eth1: 00:14:22:0c:e1:37
-  ip_eth1: 192.168.133.85
-  mac_ib0: ad:00:00:02:b6:36
-  ip_ib0: 192.168.132.35
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.85
-bordeplage-36:
-  mac_eth0: 00:14:22:0c:e1:6a
-  ip_eth0: 172.16.1.86
-  mac_eth1: 00:14:22:0c:e1:6b
-  ip_eth1: 192.168.133.86
-  mac_ib0: ad:00:00:01:5a:21
-  ip_ib0: 192.168.132.36
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-37:
-  mac_eth0: 00:14:22:0c:b1:7a
-  ip_eth0: 172.16.1.87
-  mac_eth1: 00:14:22:0c:b1:7b
-  ip_eth1: 192.168.133.87
-  mac_ib0: ad:00:00:01:61:f0
-  ip_ib0: 192.168.132.37
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-38:
-  mac_eth0: 00:13:72:69:a8:b6
-  ip_eth0: 172.16.1.88
-  mac_eth1: 00:13:72:69:a8:b7
-  ip_eth1: 192.168.133.88
-  mac_ib0: ad:00:00:01:61:e0
-  ip_ib0: 192.168.132.38
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.88
-bordeplage-39:
-  mac_eth0: 00:14:22:0c:da:7c
-  ip_eth0: 172.16.1.89
-  mac_eth1: 00:14:22:0c:da:7d
-  ip_eth1: 192.168.133.89
-  mac_ib0: ad:00:00:01:62:04
-  ip_ib0: 192.168.132.39
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-3:
-  mac_eth0: 00:14:22:0c:e1:66
-  ip_eth0: 172.16.1.53
-  mac_eth1: 00:14:22:0c:e1:67
-  ip_eth1: 192.168.133.53
-  mac_ib0: ad:00:00:02:b4:71
-  ip_ib0: 192.168.132.3
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.53
-bordeplage-40:
-  mac_eth0: 00:13:72:69:86:4c
-  ip_eth0: 172.16.1.90
-  mac_eth1: 00:13:72:69:86:4d
-  ip_eth1: 192.168.133.90
-  mac_ib0: ad:00:00:02:b3:8e
-  ip_ib0: 192.168.132.40
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.90
-bordeplage-41:
-  mac_eth0: 00:14:22:0c:b3:92
-  ip_eth0: 172.16.1.91
-  mac_eth1: 00:14:22:0c:b3:93
-  ip_eth1: 192.168.133.91
-  mac_ib0: ad:00:00:01:5a:5d
-  ip_ib0: 192.168.132.41
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.91
-bordeplage-42:
-  mac_eth0: 00:14:22:0c:e1:a4
-  ip_eth0: 172.16.1.92
-  mac_eth1: 00:14:22:0c:e1:a5
-  ip_eth1: 192.168.133.92
-  mac_ib0: ad:00:00:01:62:80
-  ip_ib0: 192.168.132.42
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.92
-bordeplage-44:
-  mac_eth0: 00:14:22:0c:b1:1c
-  ip_eth0: 172.16.1.94
-  mac_eth1: 00:14:22:0c:b1:1d
-  ip_eth1: 192.168.133.94
-  mac_ib0: ad:00:00:02:b4:91
-  ip_ib0: 192.168.132.44
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.94
-bordeplage-45:
-  mac_eth0: 00:14:22:0c:da:88
-  ip_eth0: 172.16.1.95
-  mac_eth1: 00:14:22:0c:da:89
-  ip_eth1: 192.168.133.95
-  mac_ib0: ad:00:00:01:61:88
-  ip_ib0: 192.168.132.45
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.95
-bordeplage-46:
-  mac_eth0: 00:14:22:0c:e1:7c
-  ip_eth0: 172.16.1.96
-  mac_eth1: 00:14:22:0c:e1:7d
-  ip_eth1: 192.168.133.96
-  mac_ib0: ad:00:00:01:5a:61
-  ip_ib0: 192.168.132.46
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.96
-bordeplage-47:
-  mac_eth0: 00:14:22:0c:de:34
-  ip_eth0: 172.16.1.97
-  mac_eth1: 00:14:22:0c:de:35
-  ip_eth1: 192.168.133.97
-  mac_ib0: ad:00:00:02:b0:2b
-  ip_ib0: 192.168.132.47
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-48:
-  mac_eth0: 00:14:22:0c:db:ca
-  ip_eth0: 172.16.1.98
-  mac_eth1: 00:14:22:0c:db:cb
-  ip_eth1: 192.168.133.98
-  mac_ib0: ad:00:00:01:62:58
-  ip_ib0: 192.168.132.48
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-4:
-  mac_eth0: 00:14:22:0c:d9:fa
-  ip_eth0: 172.16.1.54
-  mac_eth1: 00:14:22:0c:d9:fb
-  ip_eth1: 192.168.133.54
-  mac_ib0: ad:00:00:01:61:e8
-  ip_ib0: 192.168.132.4
-  mac_ib1: ""
-  ip_ib1: ""
-bordeplage-5:
-  mac_eth0: 00:14:22:0c:e1:74
-  ip_eth0: 172.16.1.55
-  mac_eth1: 00:14:22:0c:e1:75
-  ip_eth1: 192.168.133.55
-  mac_ib0: ad:00:00:01:61:b4
-  ip_ib0: 192.168.132.5
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.55
-bordeplage-6:
-  mac_eth0: 00:14:22:0c:da:6e
-  ip_eth0: 172.16.1.56
-  mac_eth1: 00:14:22:0c:da:6f
-  ip_eth1: 192.168.133.56
-  mac_ib0: ad:00:00:01:61:38
-  ip_ib0: 192.168.132.6
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.56
-bordeplage-7:
-  mac_eth0: 00:14:22:0c:e1:44
-  ip_eth0: 172.16.1.57
-  mac_eth1: 00:14:22:0c:e1:45
-  ip_eth1: 192.168.133.57
-  mac_ib0: ad:00:00:01:5a:4d
-  ip_ib0: 192.168.132.7
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.57
-bordeplage-8:
-  mac_eth0: 00:14:22:0c:da:40
-  ip_eth0: 172.16.1.58
-  mac_eth1: 00:14:22:0c:da:41
-  ip_eth1: 192.168.133.58
-  mac_ib0: ad:00:00:02:aa:7f
-  ip_ib0: 192.168.132.8
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.58
-bordeplage-9:
-  mac_eth0: 00:14:22:0c:da:50
-  ip_eth0: 172.16.1.59
-  mac_eth1: 00:14:22:0c:da:51
-  ip_eth1: 192.168.133.59
-  mac_ib0: ad:00:00:02:a5:7f
-  ip_ib0: 192.168.132.9
-  mac_ib1: ""
-  ip_ib1: ""
-  ip_mgt: 172.16.7.59
-bordereau-10:
-  mac_eth0: 00:14:5e:55:6b:ca
-  ip_eth0: 172.16.1.111
-  mac_eth1: 00:14:5e:55:6b:cb
-  ip_eth1: 192.168.133.111
-  ip_mgt: 172.16.7.112
-  mac_mgt: 00:14:5E:55:6B:CC
-bordereau-11:
-  mac_eth0: 00:14:5e:55:5c:81
-  ip_eth0: 172.16.1.112
-  mac_eth1: 00:14:5e:55:5c:82
-  ip_eth1: 192.168.133.112
-  ip_mgt: 172.16.7.113
-  mac_mgt: 00:14:5E:55:5C:83
-bordereau-12:
-  mac_eth0: 00:14:5e:55:58:f7
-  ip_eth0: 172.16.1.113
-  mac_eth1: 00:14:5e:55:58:f8
-  ip_eth1: 192.168.133.113
-  ip_mgt: 172.16.7.114
-  mac_mgt: 00:14:5E:55:58:F9
-bordereau-13:
-  mac_eth0: 00:14:5e:55:59:63
-  ip_eth0: 172.16.1.114
-  mac_eth1: 00:14:5e:55:59:64
-  ip_eth1: 192.168.133.114
-  ip_mgt: 172.16.7.115
-  mac_mgt: 00:14:5E:55:59:65
-bordereau-14:
-  mac_eth0: 00:14:5e:55:59:5d
-  ip_eth0: 172.16.1.115
-  mac_eth1: 00:14:5e:55:59:5e
-  ip_eth1: 192.168.133.115
-  ip_mgt: 172.16.7.116
-  mac_mgt: 00:14:5E:55:59:5F
-bordereau-15:
-  mac_eth0: 00:14:5e:55:6a:f2
-  ip_eth0: 172.16.1.116
-  mac_eth1: 00:14:5e:55:6a:f3
-  ip_eth1: 192.168.133.116
-  ip_mgt: 172.16.7.117
-  mac_mgt: 00:14:5E:55:6A:F4
-bordereau-16:
-  mac_eth0: 00:14:5e:55:5d:ec
-  ip_eth0: 172.16.1.117
-  mac_eth1: 00:14:5e:55:5d:ed
-  ip_eth1: 192.168.133.117
-  ip_mgt: 172.16.7.118
-  mac_mgt: 00:14:5E:55:5D:EE
-bordereau-17:
-  mac_eth0: 00:14:5e:55:5e:a9
-  ip_eth0: 172.16.1.118
-  mac_eth1: 00:14:5e:55:5e:aa
-  ip_eth1: 192.168.133.118
-  ip_mgt: 172.16.7.119
-  mac_mgt: 00:14:5E:55:5E:AB
-bordereau-18:
-  mac_eth0: 00:14:5e:55:64:0d
-  ip_eth0: 172.16.1.119
-  mac_eth1: 00:14:5e:55:64:0e
-  ip_eth1: 192.168.133.119
-  ip_mgt: 172.16.7.120
-  mac_mgt: 00:14:5E:55:64:0F
-bordereau-19:
-  mac_eth0: 00:14:5e:55:68:67
-  ip_eth0: 172.16.1.120
-  mac_eth1: 00:14:5e:55:68:68
-  ip_eth1: 192.168.133.120
-  ip_mgt: 172.16.7.121
-  mac_mgt: 00:14:5E:55:68:69
-bordereau-20:
-  mac_eth0: 00:14:5e:55:62:b1
-  ip_eth0: 172.16.1.121
-  mac_eth1: 00:14:5e:55:62:b2
-  ip_eth1: 192.168.133.121
-  ip_mgt: 172.16.7.122
-  mac_mgt: 00:14:5E:55:62:B3
-bordereau-21:
-  mac_eth0: 00:14:5e:55:5a:98
-  ip_eth0: 172.16.1.122
-  mac_eth1: 00:14:5e:55:5a:99
-  ip_eth1: 192.168.133.122
-  ip_mgt: 172.16.7.123
-  mac_mgt: 00:14:5E:55:5A:9A
-bordereau-22:
-  mac_eth0: 00:14:5e:55:59:84
-  ip_eth0: 172.16.1.123
-  mac_eth1: 00:14:5e:55:59:85
-  ip_eth1: 192.168.133.123
-  ip_mgt: 172.16.7.124
-  mac_mgt: 00:14:5E:55:59:86
-bordereau-23:
-  mac_eth0: 00:14:5e:55:62:96
-  ip_eth0: 172.16.1.124
-  mac_eth1: 00:14:5e:55:62:97
-  ip_eth1: 192.168.133.124
-  ip_mgt: 172.16.7.125
-  mac_mgt: 00:14:5E:55:62:98
-bordereau-24:
-  mac_eth0: 00:14:5e:55:5d:da
-  ip_eth0: 172.16.1.125
-  mac_eth1: 00:14:5e:55:5d:db
-  ip_eth1: 192.168.133.125
-  ip_mgt: 172.16.7.126
-  mac_mgt: 00:14:5E:55:5D:DC
-bordereau-25:
-  mac_eth0: 00:14:5e:55:5d:b9
-  ip_eth0: 172.16.1.126
-  mac_eth1: 00:14:5e:55:5d:ba
-  ip_eth1: 192.168.133.126
-  ip_mgt: 172.16.7.127
-  mac_mgt: 00:14:5E:55:5D:BB
-bordereau-26:
-  mac_eth0: 00:14:5e:55:6d:2f
-  ip_eth0: 172.16.1.127
-  mac_eth1: 00:14:5e:55:6d:30
-  ip_eth1: 192.168.133.127
-  ip_mgt: 172.16.7.128
-  mac_mgt: 00:14:5E:55:6D:31
-bordereau-27:
-  mac_eth0: 00:14:5e:55:5c:69
-  ip_eth0: 172.16.1.128
-  mac_eth1: 00:14:5e:55:5c:6a
-  ip_eth1: 192.168.133.128
-  ip_mgt: 172.16.7.129
-  mac_mgt: 00:14:5E:55:5C:6B
-bordereau-28:
-  mac_eth0: 00:14:5e:55:5e:88
-  ip_eth0: 172.16.1.129
-  mac_eth1: 00:14:5e:55:5e:89
-  ip_eth1: 192.168.133.129
-  ip_mgt: 172.16.7.130
-  mac_mgt: 00:14:5E:55:5E:8A
-bordereau-29:
-  mac_eth0: 00:14:5e:55:5c:c3
-  ip_eth0: 172.16.1.130
-  mac_eth1: 00:14:5e:55:5c:c4
-  ip_eth1: 192.168.133.130
-  ip_mgt: 172.16.7.131
-  mac_mgt: 00:14:5E:55:5C:C5
-bordereau-2:
-  mac_eth0: 00:14:5e:55:5d:2c
-  ip_eth0: 172.16.1.103
-  mac_eth1: 00:14:5e:55:5d:2d
-  ip_eth1: 192.168.133.103
-  ip_mgt: 172.16.7.104
-  mac_mgt: 00:14:5E:55:5D:2E
-bordereau-30:
-  mac_eth0: 00:14:5e:55:5e:d6
-  ip_eth0: 172.16.1.131
-  mac_eth1: 00:14:5e:55:5e:d7
-  ip_eth1: 192.168.133.131
-  ip_mgt: 172.16.7.132
-  mac_mgt: 00:14:5E:55:5E:D8
-bordereau-31:
-  mac_eth0: 00:14:5e:55:59:b7
-  ip_eth0: 172.16.1.132
-  mac_eth1: 00:14:5e:55:59:b8
-  ip_eth1: 192.168.133.132
-  ip_mgt: 172.16.7.133
-  mac_mgt: 00:14:5E:55:59:B9
-bordereau-32:
-  mac_eth0: 00:14:5e:55:59:bd
-  ip_eth0: 172.16.1.133
-  mac_eth1: 00:14:5e:55:59:be
-  ip_eth1: 192.168.133.133
-  ip_mgt: 172.16.7.134
-  mac_mgt: 00:14:5E:55:59:BF
-bordereau-33:
-  mac_eth0: 00:14:5e:55:5e:b2
-  ip_eth0: 172.16.1.134
-  mac_eth1: 00:14:5e:55:5e:b3
-  ip_eth1: 192.168.133.134
-  ip_mgt: 172.16.7.135
-  mac_mgt: 00:14:5E:55:5E:B4
-bordereau-34:
-  mac_eth0: 00:14:5e:55:5d:02
-  ip_eth0: 172.16.1.135
-  mac_eth1: 00:14:5e:55:5d:03
-  ip_eth1: 192.168.133.135
-  ip_mgt: 172.16.7.136
-  mac_mgt: 00:14:5E:55:5D:04
-bordereau-35:
-  mac_eth0: 00:14:5e:55:5e:22
-  ip_eth0: 172.16.1.136
-  mac_eth1: 00:14:5e:55:5e:23
-  ip_eth1: 192.168.133.136
-  ip_mgt: 172.16.7.137
-  mac_mgt: 00:14:5E:55:5E:24
-bordereau-36:
-  mac_eth0: 00:14:5e:55:69:f0
-  ip_eth0: 172.16.1.137
-  mac_eth1: 00:14:5e:55:69:f1
-  ip_eth1: 192.168.133.137
-  ip_mgt: 172.16.7.138
-  mac_mgt: 00:14:5E:55:69:F2
-bordereau-37:
-  mac_eth0: 00:14:5e:55:5f:d2
-  ip_eth0: 172.16.1.138
-  mac_eth1: 00:14:5e:55:5f:d3
-  ip_eth1: 192.168.133.138
-  ip_mgt: 172.16.7.139
-  mac_mgt: 00:14:5E:55:5F:D4
-bordereau-38:
-  mac_eth0: 00:14:5e:55:5f:0f
-  ip_eth0: 172.16.1.139
-  mac_eth1: 00:14:5e:55:5f:10
-  ip_eth1: 192.168.133.139
-  ip_mgt: 172.16.7.140
-  mac_mgt: 00:14:5E:55:5F:11
-bordereau-39:
-  mac_eth0: 00:14:5e:55:63:2f
-  ip_eth0: 172.16.1.140
-  mac_eth1: 00:14:5e:55:63:30
-  ip_eth1: 192.168.133.140
-  ip_mgt: 172.16.7.141
-  mac_mgt: 00:14:5E:55:63:31
-bordereau-3:
-  mac_eth0: 00:14:5e:55:5c:42
-  ip_eth0: 172.16.1.104
-  mac_eth1: 00:14:5e:55:5c:43
-  ip_eth1: 192.168.133.104
-  ip_mgt: 172.16.7.105
-  mac_mgt: 00:14:5E:55:5C:44
-bordereau-41:
-  mac_eth0: 00:14:5e:55:59:00
-  ip_eth0: 172.16.1.142
-  mac_eth1: 00:14:5e:55:59:01
-  ip_eth1: 192.168.133.142
-  ip_mgt: 172.16.7.143
-  mac_mgt: 00:14:5E:55:59:02
-bordereau-42:
-  mac_eth0: 00:14:5e:55:60:95
-  ip_eth0: 172.16.1.143
-  mac_eth1: 00:14:5e:55:60:96
-  ip_eth1: 192.168.133.143
-  ip_mgt: 172.16.7.144
-  mac_mgt: 00:14:5E:55:60:97
-bordereau-43:
-  mac_eth0: 00:14:5e:55:6c:00
-  ip_eth0: 172.16.1.144
-  mac_eth1: 00:14:5e:55:6c:01
-  ip_eth1: 192.168.133.144
-  ip_mgt: 172.16.7.145
-  mac_mgt: 00:14:5E:55:6C:02
-bordereau-44:
-  mac_eth0: 00:14:5e:55:59:d2
-  ip_eth0: 172.16.1.145
-  mac_eth1: 00:14:5e:55:59:d3
-  ip_eth1: 192.168.133.145
-  ip_mgt: 172.16.7.146
-  mac_mgt: 00:14:5E:55:59:D4
-bordereau-45:
-  mac_eth0: 00:14:5e:55:5c:bd
-  ip_eth0: 172.16.1.146
-  mac_eth1: 00:14:5e:55:5c:be
-  ip_eth1: 192.168.133.146
-  ip_mgt: 172.16.7.147
-  mac_mgt: 00:14:5E:55:5C:BF
-bordereau-46:
-  mac_eth0: 00:14:5e:55:5c:60
-  ip_eth0: 172.16.1.147
-  mac_eth1: 00:14:5e:55:5c:61
-  ip_eth1: 192.168.133.147
-  ip_mgt: 172.16.7.148
-  mac_mgt: 00:14:5E:55:5C:62
-bordereau-47:
-  mac_eth0: 00:14:5e:55:6c:a8
-  ip_eth0: 172.16.1.148
-  mac_eth1: 00:14:5e:55:6c:a9
-  ip_eth1: 192.168.133.148
-  ip_mgt: 172.16.7.149
-  mac_mgt: 00:14:5E:55:6C:AA
-bordereau-48:
-  mac_eth0: 00:14:5e:55:58:fd
-  ip_eth0: 172.16.1.149
-  mac_eth1: 00:14:5e:55:58:fe
-  ip_eth1: 192.168.133.149
-  ip_mgt: 172.16.7.150
-  mac_mgt: 00:14:5E:55:58:FF
-bordereau-49:
-  mac_eth0: 00:14:5e:55:62:e7
-  ip_eth0: 172.16.1.150
-  mac_eth1: 00:14:5e:55:62:e8
-  ip_eth1: 192.168.133.150
-  ip_mgt: 172.16.7.151
-  mac_mgt: 00:14:5E:55:62:E9
-bordereau-4:
-  mac_eth0: 00:14:5e:55:68:c7
-  ip_eth0: 172.16.1.105
-  mac_eth1: 00:14:5e:55:68:c8
-  ip_eth1: 192.168.133.105
-  ip_mgt: 172.16.7.106
-  mac_mgt: 00:14:5E:55:68:C9
-bordereau-50:
-  mac_eth0: 00:14:5e:55:5e:ac
-  ip_eth0: 172.16.1.151
-  mac_eth1: 00:14:5e:55:5e:ad
-  ip_eth1: 192.168.133.151
-  ip_mgt: 172.16.7.152
-  mac_mgt: 00:14:5E:55:5E:AE
-bordereau-51:
-  mac_eth0: 00:14:5e:55:5c:d5
-  ip_eth0: 172.16.1.152
-  mac_eth1: 00:14:5e:55:5c:d6
-  ip_eth1: 192.168.133.152
-  ip_mgt: 172.16.7.153
-  mac_mgt: 00:14:5E:55:5C:D7
-bordereau-52:
-  mac_eth0: 00:14:5e:55:5d:b3
-  ip_eth0: 172.16.1.153
-  mac_eth1: 00:14:5e:55:5d:b4
-  ip_eth1: 192.168.133.153
-  ip_mgt: 172.16.7.154
-  mac_mgt: 00:14:5E:55:5D:B5
-bordereau-53:
-  mac_eth0: 00:14:5e:55:6c:1b
-  ip_eth0: 172.16.1.154
-  mac_eth1: 00:14:5e:55:6c:1c
-  ip_eth1: 192.168.133.154
-  ip_mgt: 172.16.7.155
-  mac_mgt: 00:14:5E:55:6C:1D
-bordereau-54:
-  mac_eth0: 00:14:5e:55:63:b6
-  ip_eth0: 172.16.1.155
-  mac_eth1: 00:14:5e:55:63:b7
-  ip_eth1: 192.168.133.155
-  ip_mgt: 172.16.7.156
-  mac_mgt: 00:14:5E:55:63:B8
-bordereau-55:
-  mac_eth0: 00:14:5e:55:5c:ed
-  ip_eth0: 172.16.1.156
-  mac_eth1: 00:14:5e:55:5c:ee
-  ip_eth1: 192.168.133.156
-  ip_mgt: 172.16.7.157
-  mac_mgt: 00:14:5E:55:5C:EF
-bordereau-56:
-  mac_eth0: 00:14:5e:55:60:cb
-  ip_eth0: 172.16.1.157
-  mac_eth1: 00:14:5e:55:60:cc
-  ip_eth1: 192.168.133.157
-  ip_mgt: 172.16.7.158
-  mac_mgt: 00:14:5E:55:60:CD
-bordereau-58:
-  mac_eth0: 00:14:5e:55:5e:a6
-  ip_eth0: 172.16.1.159
-  mac_eth1: 00:14:5e:55:5e:a7
-  ip_eth1: 192.168.133.159
-  ip_mgt: 172.16.7.160
-  mac_mgt: 00:14:5E:55:5E:A8
-bordereau-59:
-  mac_eth0: 00:14:5e:55:5c:d8
-  ip_eth0: 172.16.1.160
-  mac_eth1: 00:14:5e:55:5c:d9
-  ip_eth1: 192.168.133.160
-  ip_mgt: 172.16.7.161
-  mac_mgt: 00:14:5E:55:5C:DA
-bordereau-5:
-  mac_eth0: 00:14:5e:55:61:94
-  ip_eth0: 172.16.1.106
-  mac_eth1: 00:14:5e:55:61:95
-  ip_eth1: 192.168.133.106
-  ip_mgt: 172.16.7.107
-  mac_mgt: 00:14:5E:55:61:96
-bordereau-60:
-  mac_eth0: 00:14:5e:55:5b:5b
-  ip_eth0: 172.16.1.161
-  mac_eth1: 00:14:5e:55:5b:5c
-  ip_eth1: 192.168.133.161
-  ip_mgt: 172.16.7.162
-  mac_mgt: 00:14:5E:55:5B:5D
-bordereau-61:
-  mac_eth0: 00:14:5e:55:58:49
-  ip_eth0: 172.16.1.162
-  mac_eth1: 00:14:5e:55:58:4a
-  ip_eth1: 192.168.133.162
-  ip_mgt: 172.16.7.163
-  mac_mgt: 00:14:5E:55:58:4B
-bordereau-62:
-  mac_eth0: 00:14:5e:55:63:26
-  ip_eth0: 172.16.1.163
-  mac_eth1: 00:14:5e:55:63:27
-  ip_eth1: 192.168.133.163
-  ip_mgt: 172.16.7.164
-  mac_mgt: 00:14:5E:55:63:28
-bordereau-63:
-  mac_eth0: 00:14:5e:55:5c:6c
-  ip_eth0: 172.16.1.164
-  mac_eth1: 00:14:5e:55:5c:6d
-  ip_eth1: 192.168.133.164
-  ip_mgt: 172.16.7.165
-  mac_mgt: 00:14:5E:55:5C:6E
-bordereau-64:
-  mac_eth0: 00:14:5e:55:5c:cf
-  ip_eth0: 172.16.1.165
-  mac_eth1: 00:14:5e:55:5c:d0
-  ip_eth1: 192.168.133.165
-  ip_mgt: 172.16.7.166
-  mac_mgt: 00:14:5E:55:5C:D1
-bordereau-65:
-  mac_eth0: 00:14:5e:55:59:f9
-  ip_eth0: 172.16.1.166
-  mac_eth1: 00:14:5e:55:59:fa
-  ip_eth1: 192.168.133.166
-  ip_mgt: 172.16.7.167
-  mac_mgt: 00:14:5E:55:59:FB
-bordereau-66:
-  mac_eth0: 00:14:5e:55:5e:19
-  ip_eth0: 172.16.1.167
-  mac_eth1: 00:14:5e:55:5e:1a
-  ip_eth1: 192.168.133.167
-  ip_mgt: 172.16.7.168
-  mac_mgt: 00:14:5E:55:5E:1B
-bordereau-67:
-  mac_eth0: 00:14:5e:55:5c:1b
-  ip_eth0: 172.16.1.168
-  mac_eth1: 00:14:5e:55:5c:1c
-  ip_eth1: 192.168.133.168
-  ip_mgt: 172.16.7.169
-  mac_mgt: 00:14:5E:55:5C:1D
-bordereau-69:
-  mac_eth0: 00:14:5e:55:63:ce
-  ip_eth0: 172.16.1.170
-  mac_eth1: 00:14:5e:55:63:cf
-  ip_eth1: 192.168.133.170
-  ip_mgt: 172.16.7.171
-  mac_mgt: 00:14:5E:55:63:D0
-bordereau-6:
-  mac_eth0: 00:14:5e:55:58:ee
-  ip_eth0: 172.16.1.107
-  mac_eth1: 00:14:5e:55:58:ef
-  ip_eth1: 192.168.133.107
-  ip_mgt: 172.16.7.108
-  mac_mgt: 00:14:5E:55:58:F0
-bordereau-70:
-  mac_eth0: 00:14:5e:55:6a:fe
-  ip_eth0: 172.16.1.171
-  mac_eth1: 00:14:5e:55:6a:ff
-  ip_eth1: 192.168.133.171
-  ip_mgt: 172.16.7.172
-  mac_mgt: 00:14:5E:55:6B:00
-bordereau-71:
-  mac_eth0: 00:14:5e:55:59:44
-  ip_eth0: 172.16.1.172
-  mac_eth1: 00:14:5e:55:59:45
-  ip_eth1: 192.168.133.172
-  ip_mgt: 172.16.7.173
-  mac_mgt: 00:14:5E:55:59:46
-bordereau-72:
-  mac_eth0: 00:14:5e:55:5a:3e
-  ip_eth0: 172.16.1.173
-  mac_eth1: 00:14:5e:55:5a:3f
-  ip_eth1: 192.168.133.173
-  ip_mgt: 172.16.7.174
-  mac_mgt: 00:14:5E:55:5A:40
-bordereau-73:
-  mac_eth0: 00:14:5e:55:6a:1a
-  ip_eth0: 172.16.1.174
-  mac_eth1: 00:14:5e:55:6a:1b
-  ip_eth1: 192.168.133.174
-  ip_mgt: 172.16.7.175
-  mac_mgt: 00:14:5E:55:6A:1C
-bordereau-74:
-  mac_eth0: 00:14:5e:55:64:04
-  ip_eth0: 172.16.1.175
-  mac_eth1: 00:14:5e:55:64:05
-  ip_eth1: 192.168.133.175
-  ip_mgt: 172.16.7.176
-  mac_mgt: 00:14:5E:55:64:06
-bordereau-75:
-  mac_eth0: 00:14:5e:55:5e:af
-  ip_eth0: 172.16.1.176
-  mac_eth1: 00:14:5e:55:5e:b0
-  ip_eth1: 192.168.133.176
-  ip_mgt: 172.16.7.177
-  mac_mgt: 00:14:5E:55:5E:B1
-bordereau-76:
-  mac_eth0: 00:14:5e:55:5d:08
-  ip_eth0: 172.16.1.177
-  mac_eth1: 00:14:5e:55:5d:09
-  ip_eth1: 192.168.133.177
-  ip_mgt: 172.16.7.178
-  mac_mgt: 00:14:5E:55:5D:0A
-bordereau-77:
-  mac_eth0: 00:14:5e:55:63:5f
-  ip_eth0: 172.16.1.178
-  mac_eth1: 00:14:5e:55:63:60
-  ip_eth1: 192.168.133.178
-  ip_mgt: 172.16.7.179
-  mac_mgt: 00:14:5E:55:63:61
-bordereau-78:
-  mac_eth0: 00:14:5e:55:63:fb
-  ip_eth0: 172.16.1.179
-  mac_eth1: 00:14:5e:55:63:fc
-  ip_eth1: 192.168.133.179
-  ip_mgt: 172.16.7.180
-  mac_mgt: 00:14:5E:55:63:FD
-bordereau-79:
-  mac_eth0: 00:14:5e:55:62:ed
-  ip_eth0: 172.16.1.180
-  mac_eth1: 00:14:5e:55:62:ee
-  ip_eth1: 192.168.133.180
-  ip_mgt: 172.16.7.181
-  mac_mgt: 00:14:5E:55:62:EF
-bordereau-7:
-  mac_eth0: 00:14:5e:55:5e:7c
-  ip_eth0: 172.16.1.108
-  mac_eth1: 00:14:5e:55:5e:7d
-  ip_eth1: 192.168.133.108
-  ip_mgt: 172.16.7.109
-  mac_mgt: 00:14:5E:55:5E:7E
-bordereau-80:
-  mac_eth0: 00:14:5e:55:5c:ae
-  ip_eth0: 172.16.1.181
-  mac_eth1: 00:14:5e:55:5c:af
-  ip_eth1: 192.168.133.181
-  ip_mgt: 172.16.7.182
-  mac_mgt: 00:14:5E:55:5C:B0
-bordereau-81:
-  mac_eth0: 00:14:5e:55:58:a6
-  ip_eth0: 172.16.1.182
-  mac_eth1: 00:14:5e:55:58:a7
-  ip_eth1: 192.168.133.182
-  ip_mgt: 172.16.7.183
-  mac_mgt: 00:14:5E:55:58:A8
-bordereau-82:
-  mac_eth0: 00:14:5e:55:68:85
-  ip_eth0: 172.16.1.183
-  mac_eth1: 00:14:5e:55:68:86
-  ip_eth1: 192.168.133.183
-  ip_mgt: 172.16.7.184
-  mac_mgt: 00:14:5E:55:68:87
-bordereau-83:
-  mac_eth0: 00:14:5e:55:6d:23
-  ip_eth0: 172.16.1.184
-  mac_eth1: 00:14:5e:55:6d:24
-  ip_eth1: 192.168.133.184
-  ip_mgt: 172.16.7.185
-  mac_mgt: 00:14:5E:55:6D:25
-bordereau-84:
-  mac_eth0: 00:14:5e:55:5c:48
-  ip_eth0: 172.16.1.185
-  mac_eth1: 00:14:5e:55:5c:49
-  ip_eth1: 192.168.133.185
-  ip_mgt: 172.16.7.186
-  mac_mgt: 00:14:5E:55:5C:4A
-bordereau-85:
-  mac_eth0: 00:14:5e:55:59:41
-  ip_eth0: 172.16.1.186
-  mac_eth1: 00:14:5e:55:59:42
-  ip_eth1: 192.168.133.186
-  ip_mgt: 172.16.7.187
-  mac_mgt: 00:14:5E:55:59:43
-bordereau-86:
-  mac_eth0: 00:14:5e:55:68:ca
-  ip_eth0: 172.16.1.187
-  mac_eth1: 00:14:5e:55:68:cb
-  ip_eth1: 192.168.133.187
-  ip_mgt: 172.16.7.188
-  mac_mgt: 00:14:5E:55:68:CC
-bordereau-87:
-  mac_eth0: 00:14:5e:55:5e:28
-  ip_eth0: 172.16.1.188
-  mac_eth1: 00:14:5e:55:5e:29
-  ip_eth1: 192.168.133.188
-  ip_mgt: 172.16.7.189
-  mac_mgt: 00:14:5E:55:5E:2A
-bordereau-88:
-  mac_eth0: 00:14:5e:55:5d:6b
-  ip_eth0: 172.16.1.189
-  mac_eth1: 00:14:5e:55:5d:6c
-  ip_eth1: 192.168.133.189
-  ip_mgt: 172.16.7.190
-  mac_mgt: 00:14:5E:55:5D:6D
-bordereau-89:
-  mac_eth0: 00:14:5e:55:6d:05
-  ip_eth0: 172.16.1.190
-  mac_eth1: 00:14:5e:55:6d:06
-  ip_eth1: 192.168.133.190
-  ip_mgt: 172.16.7.191
-  mac_mgt: 00:14:5E:55:6D:07
-bordereau-8:
-  mac_eth0: 00:14:5e:55:60:f8
-  ip_eth0: 172.16.1.109
-  mac_eth1: 00:14:5e:55:60:f9
-  ip_eth1: 192.168.133.109
-  ip_mgt: 172.16.7.110
-  mac_mgt: 00:14:5E:55:60:FA
-bordereau-90:
-  mac_eth0: 00:14:5e:55:6d:29
-  ip_eth0: 172.16.1.191
-  mac_eth1: 00:14:5e:55:6d:2a
-  ip_eth1: 192.168.133.191
-  ip_mgt: 172.16.7.192
-  mac_mgt: 00:14:5E:55:6D:2B
-bordereau-91:
-  mac_eth0: 00:14:5e:55:5c:c6
-  ip_eth0: 172.16.1.192
-  mac_eth1: 00:14:5e:55:5c:c7
-  ip_eth1: 192.168.133.192
-  ip_mgt: 172.16.7.193
-  mac_mgt: 00:14:5E:55:5C:C8
-bordereau-92:
-  mac_eth0: 00:14:5e:55:6a:4a
-  ip_eth0: 172.16.1.193
-  mac_eth1: 00:14:5e:55:6a:4b
-  ip_eth1: 192.168.133.193
-  ip_mgt: 172.16.7.194
-  mac_mgt: 00:14:5E:55:6A:4C
-bordereau-93:
-  mac_eth0: 00:14:5e:55:6d:14
-  ip_eth0: 172.16.1.194
-  mac_eth1: 00:14:5e:55:6d:15
-  ip_eth1: 192.168.133.194
-  ip_mgt: 172.16.7.195
-  mac_mgt: 00:14:5E:55:6D:16
-bordereau-9:
-  mac_eth0: 00:14:5e:55:5e:e8
-  ip_eth0: 172.16.1.110
-  mac_eth1: 00:14:5e:55:5e:e9
-  ip_eth1: 192.168.133.110
-  ip_mgt: 172.16.7.111
-  mac_mgt: 00:14:5E:55:5E:EA