diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
index 8d7288b340b0d829851b45f6b80dab5a248b2c49..534771354efbecd08ccdf4c1cf25b48e223e1456 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/bordeplage.json
@@ -1,6 +1,5 @@
 {
   "created_at": null,
-  "misc": "Motherboard Bios version: A05 ;IPMI version 1.5: Firware revision 1.6",
   "model": "Dell PowerEdge 1855",
   "type": "cluster",
   "uid": "bordeplage"
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
index 250b2590a54f9a88f850f96666b82dcbdd15b19b..3e244e13c32f23eee779b80d39dd0c5199dd6513 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-1.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "6PFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.1",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-1-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.51",
-      "mac": "",
+      "mac": "00:14:22:0c:d9:ec",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.51",
-      "mac": "",
+      "mac": "00:14:22:0c:d9:ed",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:56",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.1",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-1-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:9d:57",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:d9:ec",
+      "interface": "Ethernet",
+      "ip": "172.16.7.51",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K4G7",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
index 09cdb454f04af007c227341f4b5988c41fffbc0f..ec506509f321bd092df8e431390036f63d8fa4e3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-10.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "6PFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.10",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-10-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.60",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.60",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "ip": "192.168.132.10",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-10-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:76",
+      "interface": "Ethernet",
+      "ip": "172.16.7.60",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K4G7",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
index b010db5129564555cb8f28d3309a2f3a07c874cf..2cace75de52991860d99c8f0abe2fbe53497bb4f 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-11.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "FC5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.11",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-11-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.61",
-      "mac": "",
+      "mac": "00:14:22:0c:d9:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.61",
-      "mac": "",
+      "mac": "00:14:22:0c:d9:bd",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2a",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.11",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-11-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:2b",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:d9:bc",
+      "interface": "Ethernet",
+      "ip": "172.16.7.61",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2FTKM",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
index 5b57f40a907635f8c087811d582b0c6e9a113686..eed4c7cc6194a70a86f5090ffbcb6c2c0ec00c98 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-12.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "2D5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.12",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-12-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.62",
-      "mac": "",
+      "mac": "00:14:22:0c:da:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.62",
-      "mac": "",
+      "mac": "00:14:22:0c:da:75",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3e",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.12",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-12-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3f",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:74",
+      "interface": "Ethernet",
+      "ip": "172.16.7.62",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2HKM6",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
index 17fbe8f49cf7b2b4e04f8f280c1bcaf513129fef..81e97ea4a1eb49e038c83d760139d3a7e6685e98 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-13.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "9D5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.13",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-13-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.63",
-      "mac": "",
+      "mac": "00:14:22:0c:da:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.63",
-      "mac": "",
+      "mac": "00:14:22:0c:da:83",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7b",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.13",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-13-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:7c",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:82",
+      "interface": "Ethernet",
+      "ip": "172.16.7.63",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JD77",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
index f1c246eec68db4aabf049518603d8de1ff081677..e114950f9cf3f5dbbc526e225495a4e96aff1eb3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-14.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "HC5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.14",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-14-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.64",
-      "mac": "",
+      "mac": "00:14:22:0c:da:90",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.64",
-      "mac": "",
+      "mac": "00:14:22:0c:da:91",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:52",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.14",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-14-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:53",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:90",
+      "interface": "Ethernet",
+      "ip": "172.16.7.64",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2HSD8",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
index 6fdb08c2e54907e7933f84487b67314214ad954b..17edd06a583950a43c3f16b0e0ee4dd95ea90f98 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-15.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "2PFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.15",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-15-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.65",
-      "mac": "",
+      "mac": "00:14:22:0c:da:c0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.65",
-      "mac": "",
+      "mac": "00:14:22:0c:da:c1",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:41",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.15",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-15-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:42",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:c0",
+      "interface": "Ethernet",
+      "ip": "172.16.7.65",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2A96S",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
index a985a85c5f9748d18129948c800d983e7b7a9e3b..3c54eee8b34f552c36cb2fe0714413d4188e4573 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-16.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "JPFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.16",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-16-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.66",
-      "mac": "",
+      "mac": "00:14:22:0c:da:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.66",
-      "mac": "",
+      "mac": "00:14:22:0c:da:45",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:74",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.16",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-16-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:75",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:44",
+      "interface": "Ethernet",
+      "ip": "172.16.7.66",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2HS2A",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
index 369ca03b9a92b934da53135239ff255f059bdad4..18b1003e808b4379bd79310c4e786c2b1a5464bb 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-17.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "GPFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.17",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-17-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.67",
-      "mac": "",
+      "mac": "00:14:22:0c:da:62",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.67",
-      "mac": "",
+      "mac": "00:14:22:0c:da:63",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c5",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.17",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-17-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:c6",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:62",
+      "interface": "Ethernet",
+      "ip": "172.16.7.67",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K4E4",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
index 2f78d36230461323f3c829ee73f7b5e4f37136ff..84131045f07c1dca3fe65729dfb81e0506ee49f2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-18.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "335GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.18",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-18-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.68",
-      "mac": "",
+      "mac": "00:14:22:0c:da:a2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.68",
-      "mac": "",
+      "mac": "00:14:22:0c:da:a3",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:09",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.18",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-18-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:0a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:a2",
+      "interface": "Ethernet",
+      "ip": "172.16.7.68",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT22VDZ",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
index 1a1d62036fd8da563a006bc1ee566792e6f0e67d..f8b680a7b89fb69e2f0b7ad857ac36dba2b7fdf3 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-19.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "B35GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.19",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-19-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.69",
-      "mac": "",
+      "mac": "00:14:22:0c:b4:00",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.69",
-      "mac": "",
+      "mac": "00:14:22:0c:b4:01",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b5",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.19",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-19-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b6",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:b4:00",
+      "interface": "Ethernet",
+      "ip": "172.16.7.69",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2HBCP",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
index e6a474c5438357ef2b6414fd78a97d5fee3b8329..d462a10d5b79147fcd25669c8b547c8160a6dad7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-2.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "8PFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.2",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-2-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.52",
-      "mac": "",
+      "mac": "00:14:22:0c:da:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.52",
-      "mac": "",
+      "mac": "00:14:22:0c:da:47",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:25",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.2",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-2-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:26",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:46",
+      "interface": "Ethernet",
+      "ip": "172.16.7.52",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K2PG",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
index d9a6daf3a88bfa303676ce4652deb7ab0128f28f..8145583a3af8ed274ba4a684eda31919cb5961a7 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-20.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "331KV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.20",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-20-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.70",
-      "mac": "",
+      "mac": "00:14:22:0c:b3:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.70",
-      "mac": "",
+      "mac": "00:14:22:0c:b3:1d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:b9",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.20",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-20-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:ba",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:b3:1c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.70",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2N397",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
index 095eb6ccf5a44b5f3e0ff0c11b65581bdd470d82..da5e8326a5bc512131fd8e60488111d09e728e1e 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-21.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "DKMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.21",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-21-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.71",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.71",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:49",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1a",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.21",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-21-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:1b",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:48",
+      "interface": "Ethernet",
+      "ip": "172.16.7.71",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JNMQ",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
index e58ab607894450a77adc9a055a608a34d4c4ec04..a89f8860a19eae08cc216f85c52d4fad9cc21369 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-22.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "JMZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.22",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-22-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.72",
-      "mac": "",
+      "mac": "00:14:22:0c:dd:02",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.72",
-      "mac": "",
+      "mac": "00:14:22:0c:dd:03",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:42",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.22",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-22-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:43",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:dd:02",
+      "interface": "Ethernet",
+      "ip": "172.16.7.72",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JKP2",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
index 410d8b9d5ba337bfbf038804c8cd0276dcc38e12..a1da010c06eafb2d17f8e3ebf2c7b11e99e17a79 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-23.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "HLZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.23",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-23-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.73",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.73",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:89",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.23",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-23-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:8a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:4c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.73",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K4K3",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
index 2aa853ed273d80ab7483b754626853a317e010c7..d2dd4d953efcf6fb050a0f93c2eae3d4739dd3da 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-24.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "1NZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.24",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-24-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.74",
-      "mac": "",
+      "mac": "00:14:22:0c:e0:e0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.74",
-      "mac": "",
+      "mac": "00:14:22:0c:e0:e1",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ed",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.24",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-24-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ee",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e0:e0",
+      "interface": "Ethernet",
+      "ip": "172.16.7.74",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K3TT",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
index 23a7ce2f11b3a5cc90f2b43884284e1bf95bade8..a88b3ad246f8d14a636b3f39c7cc93b8599854e2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-25.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "9LZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.25",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-25-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.75",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:76",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.75",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:77",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4b",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.25",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-25-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a4:4c",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:76",
+      "interface": "Ethernet",
+      "ip": "172.16.7.75",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JKTM",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
index 902874d4b5fa862173b4d7f5d3fe554c55c1d6dd..58c1e4d52b4c4643a31dd7db4981198412330e24 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-26.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "3MZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.26",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-26-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.76",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:52",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.76",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:53",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:95",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.26",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-26-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:96",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:52",
+      "interface": "Ethernet",
+      "ip": "172.16.7.76",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JP96",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
index a2a928e222b87c06c59ba08959ad1abc43e1e7c0..f596c9c5ac0e5007fadf10aa83cd28a99f0b4b9b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-27.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "6MZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.27",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-27-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.77",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.77",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:7f",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:56",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.27",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-27-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:57",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:7e",
+      "interface": "Ethernet",
+      "ip": "172.16.7.77",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2H3BS",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
index 4c06d31f5c42f44f9e690e29f322de782183e230..df03ca2c368a0445dbf3e3b89cfa956ca3e045a4 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-28.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "BMZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.28",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-28-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.78",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:8c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.78",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:8d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:99",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.28",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-28-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:9a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:8c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.78",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K428",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
index c4116269a16ed45aca279aaefa7452993cb52a75..f51b071f36b0d4719eb15a59fe5b170e387d39cd 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-29.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "FMZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.29",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-29-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.79",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:0a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.79",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:0b",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3a",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.29",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-29-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:3b",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:0a",
+      "interface": "Ethernet",
+      "ip": "172.16.7.79",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JMGF",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
index 47f380b8015aacab4d6b8d3d57b45574044bec78..a258799c41eb33ef89af71d24ccf7e20e668d03d 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-3.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "9KMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.3",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-3-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.53",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.53",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:67",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:72",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.3",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-3-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:73",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:66",
+      "interface": "Ethernet",
+      "ip": "172.16.7.53",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JR3S",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
index ce96375b3955610d4615485a0907dfee2490459a..e38886e3df5660ae87135e1dee589eac4199d447 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-30.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "GMZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.30",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-30-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.80",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:92",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.80",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:93",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fd",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.30",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-30-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:fe",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:92",
+      "interface": "Ethernet",
+      "ip": "172.16.7.80",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JQL0",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
index 52d450a3f2afe7adbc082aeed3acdd0c5fbc8ffb..5e33a1b9ee829955ecf97cc6994f11d6e9683126 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-31.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.31",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-31-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.81",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.81",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "ip": "192.168.132.31",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-31-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:ba",
+      "interface": "Ethernet",
+      "ip": "172.16.7.81",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": null,
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
index b35db7e79b1f1f5e3d041be0079509ff7ce6edd4..159dc2a0b49c4f29a50b5e041ef5ed3520366c8a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-32.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "635GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.32",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-32-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.82",
-      "mac": "",
+      "mac": "00:14:22:0c:da:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.82",
-      "mac": "",
+      "mac": "00:14:22:0c:da:b7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:98",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.32",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-32-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:a5:99",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:b6",
+      "interface": "Ethernet",
+      "ip": "172.16.7.82",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT1XVC4",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
index f180e91077d24fe00656b128c589f080f86d97b1..342f38a891871be7e7a27e362a1825e36f8a2cab 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-33.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "725GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.33",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-33-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.83",
-      "mac": "",
+      "mac": "00:14:22:0c:da:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.83",
-      "mac": "",
+      "mac": "00:14:22:0c:da:95",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:76",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.33",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-33-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:77",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:94",
+      "interface": "Ethernet",
+      "ip": "172.16.7.83",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2HG5S",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
index 9a9dbd7274b3159d59ce27940fec5cd6ce272689..0faaed7614964ebb78421d66dddf19e88cc411df 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-34.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "F25GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.34",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-34-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.84",
-      "mac": "",
+      "mac": "00:14:22:0c:da:12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.84",
-      "mac": "",
+      "mac": "00:14:22:0c:da:13",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:69",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.34",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-34-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:6a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:12",
+      "interface": "Ethernet",
+      "ip": "172.16.7.84",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2182C",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
index cbbaf54e08b07b080fc44f3f0293e8da45d692f5..2844396caa250f1aa3af34f01770d3ad32101bf0 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-35.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "BKMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.35",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-35-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.85",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.85",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:37",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:37",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.35",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-35-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b6:38",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:36",
+      "interface": "Ethernet",
+      "ip": "172.16.7.85",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JBZM",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
index 38b5fc993393520864e90f10f882aae8e335b4f3..94920406cb53b2d55dae770767ab14767c73be55 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-36.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "6KMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.36",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-36-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.86",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:6a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.86",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:6b",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:22",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.36",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-36-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:23",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:6a",
+      "interface": "Ethernet",
+      "ip": "172.16.7.86",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JRDS",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
index 6d47b89e92d145743029aec3834edd93c8215d14..ed23c50ac91d817f4bb91cfb0211dcad196b1458 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-37.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "H25GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.37",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-37-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.87",
-      "mac": "",
+      "mac": "00:14:22:0c:b1:7a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.87",
-      "mac": "",
+      "mac": "00:14:22:0c:b1:7b",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f1",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.37",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-37-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:f2",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:b1:7a",
+      "interface": "Ethernet",
+      "ip": "172.16.7.87",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JKTE",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
index 2d6730e5dd4409cc3d1e73135e3ec0462795648e..f42a9c9ea9ea35989219c600efb8c636f662dbac 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-38.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "FWRJZ91"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.38",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-38-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.88",
-      "mac": "",
+      "mac": "00:13:72:69:a8:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.88",
-      "mac": "",
+      "mac": "00:13:72:69:a8:b7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e1",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.38",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-38-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e2",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:13:72:69:a8:b6",
+      "interface": "Ethernet",
+      "ip": "172.16.7.88",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K4EP",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
index 6af56be43cec761c436741aac8718c6b4420dee4..026ceebfe1a623154d848d1370bbf8c60797078c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-39.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "CD5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.39",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-39-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.89",
-      "mac": "",
+      "mac": "00:14:22:0c:da:7c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.89",
-      "mac": "",
+      "mac": "00:14:22:0c:da:7d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:05",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.39",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-39-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:06",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:7c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.89",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2H2G3",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
index 2965b264a60409ecf53e2a6038590a42dd04bc0c..7359a5257afc162b9207fe50576d23841919c431 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-4.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "7D5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.4",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-4-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.54",
-      "mac": "",
+      "mac": "00:14:22:0c:d9:fa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.54",
-      "mac": "",
+      "mac": "00:14:22:0c:d9:fb",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:e9",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.4",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-4-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:ea",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:d9:fa",
+      "interface": "Ethernet",
+      "ip": "172.16.7.54",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K3TZ",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
index cbf856b6f4ee69d8accea43d8f08dad2c8a25245..fc0af83f45f27e396351748ab3e0c4f92891a572 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-40.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "8XXGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.40",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-40-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.90",
-      "mac": "",
+      "mac": "00:13:72:69:86:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.90",
-      "mac": "",
+      "mac": "00:13:72:69:86:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:8f",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.40",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-40-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b3:90",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:13:72:69:86:4c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.90",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JNWF",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
index 462df6751ba63a7b24e94721ac71459bd3a03c7f..f7df3df17ce06440dbcb0ddba167531569aa08e2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-41.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "D35GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.41",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-41-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.91",
-      "mac": "",
+      "mac": "00:14:22:0c:b3:92",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.91",
-      "mac": "",
+      "mac": "00:14:22:0c:b3:93",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5e",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.41",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-41-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:5f",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:b3:92",
+      "interface": "Ethernet",
+      "ip": "172.16.7.91",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT21F0M",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
index 8805030b23960852c6f555d6a27869e0a4aa9ea4..1a7129f724a4261773e628136c9828a6683382b2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-42.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "4KMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.42",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-42-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.92",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:a4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.92",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:a5",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:81",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.42",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-42-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:82",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:a4",
+      "interface": "Ethernet",
+      "ip": "172.16.7.92",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K38Q",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
index e1f4f52f2fb8bfb7e67cbf9bdfcb52e0fb5ffb3d..6d4c8a0bc72cf2456890f02b3a17484c3d363c4a 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-43.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "GC5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.43",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-43-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.93",
-      "mac": "",
+      "mac": "00:14:22:0c:da:8c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.93",
-      "mac": "",
+      "mac": "00:14:22:0c:da:8d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:75",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.43",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-43-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:76",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:8c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.93",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JNLS",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
index a4fb739bad3f405ed55518c933b0f3312d5b2130..5de91827762f8570383a6db837af344a49255ded 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-44.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "835GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.44",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-44-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.94",
-      "mac": "",
+      "mac": "00:14:22:0c:b1:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.94",
-      "mac": "",
+      "mac": "00:14:22:0c:b1:1d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:92",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.44",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-44-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b4:93",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:b1:1c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.94",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2EA4V",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
index 09837699c1d8a8159d4b4207bf01c0eea2bda4e6..14733ca4c494d35a3bf8d693c09428a92146e89c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-45.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "3D5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.45",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-45-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.95",
-      "mac": "",
+      "mac": "00:14:22:0c:da:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.95",
-      "mac": "",
+      "mac": "00:14:22:0c:da:89",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:89",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.45",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-45-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:8a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:88",
+      "interface": "Ethernet",
+      "ip": "172.16.7.95",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K25Q",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
index 003dc0b1a7fe1e2ade555462eda09cd99719233c..86809c208c3516e5ae741c773537b2d80ea1edd2 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-46.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "2LMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.46",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-46-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.96",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:7c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.96",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:7d",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:62",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.46",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-46-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:63",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:7c",
+      "interface": "Ethernet",
+      "ip": "172.16.7.96",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2H8ET",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
index 0a4dfeffcefafddae94b0e5b28209f19c905d84e..e30c4cb23b7e62be8c56eaa136a2da4eb469635c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-47.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "6LZGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.47",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-47-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.97",
-      "mac": "",
+      "mac": "00:14:22:0c:de:34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.97",
-      "mac": "",
+      "mac": "00:14:22:0c:de:35",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2c",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.47",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-47-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:b0:2d",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:de:34",
+      "interface": "Ethernet",
+      "ip": "172.16.7.97",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2K3MZ",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
index 3dd54e06e22968778c5474490c01a1f31f8a0182..e0f695ac4ee348d565a00c4cffbf95cd3b218b98 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-48.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "4LMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.48",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-48-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.98",
-      "mac": "",
+      "mac": "00:14:22:0c:db:ca",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.98",
-      "mac": "",
+      "mac": "00:14:22:0c:db:cb",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:59",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.48",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-48-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:62:5a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:db:ca",
+      "interface": "Ethernet",
+      "ip": "172.16.7.98",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2H2ZB",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
index b5842e8d79c1633b167baeabcd17b9e11e6e43a0..acee3d863f0d444e802eef2b4fec411915253a27 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-49.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.49",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-49-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.99",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.99",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "ip": "192.168.132.49",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-49-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": null,
+      "interface": "Ethernet",
+      "ip": "172.16.7.99",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": null,
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
index 174334a74a590e808121bbf43f39dc73d15d6d78..4e8399b41decf34bd1259927e35eddd0e9d719b1 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-5.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "JKMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.5",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-5-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.55",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.55",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:75",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b5",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.5",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-5-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:b6",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:74",
+      "interface": "Ethernet",
+      "ip": "172.16.7.55",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2H8A6",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
index 95601fe17b33121439e38bd1308f036469ddc2c9..9ea307b4bd67a5f58977a9a1c3e9955c1b97c438 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-50.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "135GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.50",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-50-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.100",
-      "mac": "",
+      "mac": "00:14:22:0c:da:a6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.100",
-      "mac": "",
+      "mac": "00:14:22:0c:da:a7",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:32",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.50",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-50-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:33",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:a6",
+      "interface": "Ethernet",
+      "ip": "172.16.7.100",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2DQFZ",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
index c937169d97d0fb0c611e98e64a00fe3d573d076a..ee1ca59634b2abc9c481c0a9aef4261efdac3dad 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-51.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "FPFGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.51",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-51-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.101",
-      "mac": "",
+      "mac": "00:14:22:0c:da:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.101",
-      "mac": "",
+      "mac": "00:14:22:0c:da:7f",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:03",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.51",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-51-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:02:4f:04",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:7e",
+      "interface": "Ethernet",
+      "ip": "172.16.7.101",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2JLQ5",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
index ea3cd22c48595ac14bebd1a5ac6b1c508f8b91cd..b3534412f5a8d432df855a1125163037625d157b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-6.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "5D5GV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.6",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-6-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.56",
-      "mac": "",
+      "mac": "00:14:22:0c:da:6e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.56",
-      "mac": "",
+      "mac": "00:14:22:0c:da:6f",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:39",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.6",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-6-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:61:3a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:6e",
+      "interface": "Ethernet",
+      "ip": "172.16.7.56",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2H2FP",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
index ee0f0f99e68e134e47b4e5cb8a858207ddd32266..876906e6d0150d69a89d329205299313bbd6558c 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-7.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(05/12/2005)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A03"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": "FKMGV1J"
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.7",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-7-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.57",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.57",
-      "mac": "",
+      "mac": "00:14:22:0c:e1:45",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4e",
+      "interface": "InfiniBand",
+      "ip": "192.168.132.7",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-7-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:04:01:80:00:00:00:00:00:00:00:05:ad:00:00:01:5a:4f",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:e1:44",
+      "interface": "Ethernet",
+      "ip": "172.16.7.57",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": "D7013KT2HKSX",
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
index a48885019011c63a88587baeba26134699bcfdd9..6717e5ad0c772a74b78e5573c355559acd889bd8 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-8.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.8",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-8-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.58",
-      "mac": "",
+      "mac": "00:14:22:0c:da:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.58",
-      "mac": "",
+      "mac": "00:14:22:0c:da:41",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "ip": "192.168.132.8",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-8-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:40",
+      "interface": "Ethernet",
+      "ip": "172.16.7.58",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": null,
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
index a2917386aa2facfce6885fb72ec3feac442aa564..73b4b2a30f45942b59ead8089c7295a30fad497b 100755
--- a/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/bordeplage/nodes/bordeplage-9.json
@@ -4,33 +4,27 @@
     "smp_size": 2,
     "smt_size": 2
   },
+  "bios": {
+    "release_date": "(01/09/2006)",
+    "vendor": "Dell Computer Corporation",
+    "version": "A05"
+  },
+  "chassis": {
+    "name": "PowerEdge 1855",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 2147483648,
     "virtual_size": null
   },
   "network_adapters": [
-    {
-      "device": "ib0",
-      "driver": "ib_mthca",
-      "enabled": true,
-      "interface": "InfiniBand",
-      "ip": "192.168.132.9",
-      "mac": "",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "bordeplage-9-ib0.bordeaux.grid5000.fr",
-      "rate": 10000000000,
-      "vendor": "Mellanox",
-      "version": "InfiniHost MT25208"
-    },
     {
       "device": "eth0",
       "driver": "e1000",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.59",
-      "mac": "",
+      "mac": "00:14:22:0c:da:50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.59",
-      "mac": "",
+      "mac": "00:14:22:0c:da:51",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -53,14 +47,49 @@
       "rate": 1000000000,
       "vendor": "Intel",
       "version": "82546GB Gigabit Ethernet Controller"
+    },
+    {
+      "device": "ib0",
+      "driver": "ib_mthca",
+      "enabled": true,
+      "guid": null,
+      "interface": "InfiniBand",
+      "ip": "192.168.132.9",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "bordeplage-9-ib0.bordeaux.grid5000.fr",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "guid": "00:14:22:0c:da:50",
+      "interface": "Ethernet",
+      "ip": "172.16.7.59",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "bordeplage-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,
@@ -76,8 +105,11 @@
   },
   "storage_devices": [
     {
+      "device": "sda",
       "driver": "mptspi",
       "interface": "SCSI",
+      "model": "ST373207LC",
+      "rev": null,
       "size": 65192580223.0835
     }
   ],
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
index 22aa2db0e95605d9a0760f52a6b47e2112ed1b97..e631b98cbfaae9be9b2a38f72e3fe20655ffa19c 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-1.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "08/09/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.13"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3249"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.196",
-      "mac": "",
+      "mac": "00:14:5e:57:67:04",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.196",
-      "mac": "",
+      "mac": "00:14:5e:57:67:02",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5d",
       "interface": "InfiniBand",
       "ip": "172.16.4.196",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:5e",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.196",
-      "mac": "",
+      "mac": "00:60:dd:47:b6:e9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.242",
+      "mac": "00:14:5e:57:67:06",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-1-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
index 1df349375d3aa0d96c94065baf469eda0d9f0f9b..7fec80914a919eed5aa8f228a6d1b7dbd90823ed 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-10.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3258"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.205",
-      "mac": "",
+      "mac": "00:14:5e:57:cb:f6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.205",
-      "mac": "",
+      "mac": "00:14:5e:57:cb:f4",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fd",
       "interface": "InfiniBand",
       "ip": "172.16.4.205",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:fe",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.205",
-      "mac": "",
+      "mac": "00:60:dd:47:b7:28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.251",
+      "mac": "00:14:5e:57:cb:f8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-10-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
index fa37fcc5778b5bdcd7e4f8fb3c1ac96d5f5823ec..f185cb7439ffd0bfe59aec002ce76fe6deba7224 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-2.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3255"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.197",
-      "mac": "",
+      "mac": "00:14:5e:57:cc:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.197",
-      "mac": "",
+      "mac": "00:14:5e:57:cc:3c",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:85",
       "interface": "InfiniBand",
       "ip": "172.16.4.197",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:86",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.197",
-      "mac": "",
+      "mac": "00:60:dd:47:b6:7a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.243",
+      "mac": "00:14:5e:57:cc:40",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-2-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
index 74e6007c2f47372cc0a07b1060f4b504875a17a0..b8844270f8a33c4af098b6bd3b4777b88a2a2c0c 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-3.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3248"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.198",
-      "mac": "",
+      "mac": "00:14:5e:57:6d:a0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.198",
-      "mac": "",
+      "mac": "00:14:5e:57:6d:9e",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ed",
       "interface": "InfiniBand",
       "ip": "172.16.4.198",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1d:ee",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.198",
-      "mac": "",
+      "mac": "00:60:dd:47:b5:69",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.244",
+      "mac": "00:14:5e:57:6d:a2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-3-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
index 16c936e9d1a4b17612b79e28f1c9cbbcbfd982aa..1ce296ef12b1c016e2616c40cd110dfc623c26a6 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-4.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3252"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.199",
-      "mac": "",
+      "mac": "00:14:5e:57:c4:d0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.199",
-      "mac": "",
+      "mac": "00:14:5e:57:c4:ce",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:85",
       "interface": "InfiniBand",
       "ip": "172.16.4.199",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1e:86",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.199",
-      "mac": "",
+      "mac": "00:60:dd:47:b7:6e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.245",
+      "mac": "00:14:5e:57:c4:d2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-4-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
index 0f21cf0cefd7a66721447f6aedc09a13ab0964fe..8ef3d3aa4f7469f79207aaf9a266208053e2e0e4 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-5.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3257"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.200",
-      "mac": "",
+      "mac": "00:14:5e:57:6d:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.200",
-      "mac": "",
+      "mac": "00:14:5e:57:6d:44",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4d",
       "interface": "InfiniBand",
       "ip": "172.16.4.200",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4e",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.200",
-      "mac": "",
+      "mac": "00:60:dd:47:b6:50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.246",
+      "mac": "00:14:5e:57:6d:48",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-5-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
index 04e0cfe0c95a7b8fdd41d0494707ca38f8fe9ad9..9b67f1c4c6c9d00f26772fd79e8764a6a33adee9 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-6.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "08/09/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.13"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3256"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.201",
-      "mac": "",
+      "mac": "00:14:5e:57:82:a6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.201",
-      "mac": "",
+      "mac": "00:14:5e:57:82:a4",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2d",
       "interface": "InfiniBand",
       "ip": "172.16.4.201",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:2e",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.201",
-      "mac": "",
+      "mac": "00:60:dd:47:b6:7d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.247",
+      "mac": "00:14:5e:57:82:a8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-6-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
index e9f1ea4cc8c20b0143d8254ed3248ff8d0b825f8..e7e2909e23e35b99400ca0f111b6598ae475140f 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-7.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3251"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.202",
-      "mac": "",
+      "mac": "00:14:5e:57:cc:02",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.202",
-      "mac": "",
+      "mac": "00:14:5e:57:cc:00",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3d",
       "interface": "InfiniBand",
       "ip": "172.16.4.202",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:3e",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.202",
-      "mac": "",
+      "mac": "00:60:dd:47:86:96",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.248",
+      "mac": "00:14:5e:57:cc:04",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-7-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
index 52e1a571c038b056bcb3d24eaad1db550fb0e5ce..1270326f791c009bd314f19d1ed5286a9fa9399e 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-8.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3250"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.203",
-      "mac": "",
+      "mac": "00:14:5e:57:cb:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.203",
-      "mac": "",
+      "mac": "00:14:5e:57:cb:d6",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:49",
       "interface": "InfiniBand",
       "ip": "172.16.4.203",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:20:4a",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.203",
-      "mac": "",
+      "mac": "00:60:dd:47:b5:14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.249",
+      "mac": "00:14:5e:57:cb:da",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-8-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",
diff --git a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
index 5e2f47cbcc449c60e37a344084177c259587a4ba..adb29def50fb3cacc8fe38eb44d8e557357bcb23 100755
--- a/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
+++ b/data/grid5000/sites/bordeaux/clusters/borderline/nodes/borderline-9.json
@@ -4,6 +4,15 @@
     "smp_size": 4,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "02/23/2007",
+    "vendor": "IBM",
+    "version": "ZYE133AUS-1.08"
+  },
+  "chassis": {
+    "name": "IBM System x3755 -[88774RG]-",
+    "serial": "99A3253"
+  },
   "main_memory": {
     "ram_size": 34359738368,
     "virtual_size": null
@@ -15,7 +24,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.1.204",
-      "mac": "",
+      "mac": "00:14:5e:57:cb:ae",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +39,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.133.204",
-      "mac": "",
+      "mac": "00:14:5e:57:cb:ac",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -43,9 +52,9 @@
       "device": "ib0",
       "driver": "ib_mthca",
       "enabled": true,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:85",
       "interface": "InfiniBand",
       "ip": "172.16.4.204",
-      "mac": "",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -54,13 +63,22 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MT25208"
     },
+    {
+      "device": "ib1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:1f:86",
+      "interface": "InfiniBand",
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MT25208"
+    },
     {
       "device": "myri0",
-      "driver": "ib_mthca",
+      "driver": "mx_driver",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "172.16.3.204",
-      "mac": "",
+      "mac": "00:60:dd:47:7d:8c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -68,12 +86,25 @@
       "rate": 10000000000,
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.16.7.250",
+      "mac": "00:14:5e:57:cb:b0",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "borderline-9-bmc.bordeaux.grid5000.fr",
+      "rate": 100000000
     }
   ],
   "operating_system": {
-    "name": "ClusterVision OS",
-    "release": "Boron",
-    "version": "3.1"
+    "kernel": "2.6.26",
+    "name": "Debian",
+    "release": "Lenny",
+    "version": "5.0"
   },
   "processor": {
     "cache_l1": null,
@@ -89,14 +120,17 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "device": "sda",
+      "driver": "aacraid",
       "interface": "SAS",
+      "model": "8k-l Stripe",
+      "rev": "V1.0",
       "size": 558793544769.287
     }
   ],
   "supported_job_types": {
     "besteffort": true,
-    "deploy": false,
+    "deploy": true,
     "virtual": "amd-v"
   },
   "type": "node",