From bdc55f50c94dd3b14819af1dbeb076a0b29fabfc Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@inria.fr>
Date: Thu, 5 Jan 2012 21:53:06 +0100
Subject: [PATCH] [grenoble] Regenerate grenobe (Close: #3205)

---
 .../clusters/adonis/nodes/adonis-1.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-10.json      | 23 +++++++---
 .../clusters/adonis/nodes/adonis-11.json      | 26 +++++++----
 .../clusters/adonis/nodes/adonis-12.json      | 26 +++++++----
 .../clusters/adonis/nodes/adonis-2.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-3.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-4.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-5.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-6.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-7.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-8.json       | 23 +++++++---
 .../clusters/adonis/nodes/adonis-9.json       | 23 +++++++---
 .../grenoble/clusters/edel/nodes/edel-1.json  | 40 ++++++++++-------
 .../grenoble/clusters/edel/nodes/edel-10.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-11.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-12.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-13.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-14.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-15.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-16.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-17.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-18.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-19.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-2.json  | 40 ++++++++++-------
 .../grenoble/clusters/edel/nodes/edel-20.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-21.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-22.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-23.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-24.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-25.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-26.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-27.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-28.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-29.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-3.json  | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-30.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-31.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-32.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-33.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-34.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-35.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-36.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-37.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-38.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-39.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-4.json  | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-40.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-41.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-42.json | 40 ++++++++++-------
 .../grenoble/clusters/edel/nodes/edel-43.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-44.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-45.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-46.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-47.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-48.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-49.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-5.json  | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-50.json | 38 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-51.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-52.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-53.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-54.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-55.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-56.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-57.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-58.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-59.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-6.json  | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-60.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-61.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-62.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-63.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-64.json | 40 ++++++++++-------
 .../grenoble/clusters/edel/nodes/edel-65.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-66.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-67.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-68.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-69.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-7.json  | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-70.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-71.json | 36 ++++++++++------
 .../grenoble/clusters/edel/nodes/edel-72.json | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-8.json  | 34 +++++++++------
 .../grenoble/clusters/edel/nodes/edel-9.json  | 34 +++++++++------
 .../clusters/genepi/nodes/genepi-1.json       | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-10.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-11.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-12.json      | 39 ++++++++++++++---
 .../clusters/genepi/nodes/genepi-13.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-14.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-15.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-16.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-17.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-18.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-19.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-2.json       | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-20.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-21.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-22.json      | 39 ++++++++++++++---
 .../clusters/genepi/nodes/genepi-23.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-24.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-25.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-26.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-27.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-28.json      | 39 ++++++++++++++---
 .../clusters/genepi/nodes/genepi-29.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-3.json       | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-30.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-31.json      | 43 +++++++++++++++----
 .../clusters/genepi/nodes/genepi-32.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-33.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-34.json      | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-4.json       | 41 ++++++++++++++----
 .../clusters/genepi/nodes/genepi-5.json       | 39 ++++++++++++++---
 .../clusters/genepi/nodes/genepi-6.json       | 41 ++++++++++++++----
 .../clusters/genepi/nodes/genepi-7.json       | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-8.json       | 37 +++++++++++++---
 .../clusters/genepi/nodes/genepi-9.json       | 37 +++++++++++++---
 data/grid5000/sites/grenoble/grenoble.json    | 13 +++---
 119 files changed, 2885 insertions(+), 1184 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index 686a39ac3d7..9163ba912e7 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJP-00251"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc1755",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55",
       "interface": "InfiniBand",
       "ip": "172.16.18.131",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 65eeba90d96..a04c4a6f9bb 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJS-00255"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc1769",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69",
       "interface": "InfiniBand",
       "ip": "172.16.18.140",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index f136b8e97e6..8ee4dae1969 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(03/12/2010)",
+    "vendor": "American Megatrends Inc.",
+    "version": 1.1
+  },
+  "chassis": {
+    "name": "bullx R425E2",
+    "serial": "XAN-SMB-00045"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c9030007bfe3,0x0002c9030007bfe4",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:bf:e3",
       "interface": "InfiniBand",
       "ip": "172.16.18.141",
       "management": false,
@@ -55,9 +64,8 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c9030007bfe3,0x0002c9030007bfe4",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:07:bf:e4",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
index f65490e7d73..e04e305f2e5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(03/12/2010)",
+    "vendor": "American Megatrends Inc.",
+    "version": 1.1
+  },
+  "chassis": {
+    "name": "X8DAH",
+    "serial": 1234567890
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c9030001570d,0x0002c9030001570e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:0d",
       "interface": "InfiniBand",
       "ip": "172.16.18.142",
       "management": false,
@@ -55,9 +64,8 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c9030001570d,0x0002c9030001570e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:0e",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
       "mountable": true,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index 45151934ef8..15e06e61fa4 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJS-00251"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc1759",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59",
       "interface": "InfiniBand",
       "ip": "172.16.18.132",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index f4a96297680..b34ec4206a8 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJP-00252"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc3d49",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49",
       "interface": "InfiniBand",
       "ip": "172.16.18.133",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index d61ec874200..920789555d8 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJS-00252"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc3d45",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45",
       "interface": "InfiniBand",
       "ip": "172.16.18.134",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index 230bcced2ca..1707a1e2896 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJP-00253"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc1465",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65",
       "interface": "InfiniBand",
       "ip": "172.16.18.135",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index d45fa7e2a04..f56f84adc3e 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJS-00253"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc4265",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65",
       "interface": "InfiniBand",
       "ip": "172.16.18.136",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 859ff0c8b23..7b589b3f25b 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJP-00254"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc3d41",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41",
       "interface": "InfiniBand",
       "ip": "172.16.18.137",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index d362ff733e8..d822cad4633 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": "XAN-SMJS-00254"
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x003048ffffcc3d51",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51",
       "interface": "InfiniBand",
       "ip": "172.16.18.138",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index f0dbf841acc..1482f87ae73 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(09/23/2009)",
+    "vendor": "American Megatrends Inc.",
+    "version": "R4222X52"
+  },
+  "chassis": {
+    "name": "bullx R422E2-IBQ",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.139",
       "management": false,
@@ -66,9 +75,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -84,9 +94,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 232830643653.86963
+      "model": "WD2502ABYS-0",
+      "size": 232830643653.87
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index 788255c3358..98ac30357e8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.51",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -44,32 +52,32 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.51",
-      "mac": null,
+      "mac": "08:00:38:35:ab:74",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-1-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "08:00:38:35:ab:75",
       "management": false,
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.51",
-      "mac": null,
+      "mac": "08:00:38:35:a3:ba",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 51c6fe36b1c..e428f21722d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.60",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-10-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.60",
-      "mac": "",
+      "mac": "08:00:38:35:a3:ca",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index 868dc5e8bda..09887b27644 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c959",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:59",
       "interface": "InfiniBand",
       "ip": "172.16.18.61",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c959",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-11-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.61",
-      "mac": "",
+      "mac": "08:00:38:35:a3:c8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 77396bd7343..aee23639a9f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.62",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-12-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 368d80cfe51..4c11b6c54fb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9cb",
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.63",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9cb",
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-13-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index 6cf3454fe21..0aee35787ec 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.64",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-14-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 4bfd387eaf4..08f56f53197 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9fb",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:fb",
       "interface": "InfiniBand",
       "ip": "172.16.18.65",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9fb",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-15-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 56cfc559174..db151d88c18 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca13",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:13",
       "interface": "InfiniBand",
       "ip": "172.16.18.66",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca13",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-16-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.66",
-      "mac": "08:00:38:35:a4:06",
+      "mac": "08:00:38:35:a3:fe",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index 603203939c2..516c55ed0d4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c96e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6e",
       "interface": "InfiniBand",
       "ip": "172.16.18.67",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c96e",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-17-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index a24bc5ded4f..bb44d2b3557 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.68",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-18-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index afaba72be5b..ab037eeac4b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9b9",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:b9",
       "interface": "InfiniBand",
       "ip": "172.16.18.69",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9b9",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-19-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index df1fec14e65..0a2e3dda0ef 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0a",
       "interface": "InfiniBand",
       "ip": "172.16.18.52",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -44,32 +52,32 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.52",
-      "mac": null,
+      "mac": "08:00:38:35:ac:06",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-2-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "08:00:38:35:ac:07",
       "management": false,
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.52",
-      "mac": null,
+      "mac": "08:00:38:35:a4:03",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index 4d16ad9e79a..a57f3ffc078 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.70",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-20-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index e3c4fb07f72..a32551bdf4b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.71",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-21-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index 6b96a93455d..864a5af0c7c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c96b",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6b",
       "interface": "InfiniBand",
       "ip": "172.16.18.72",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c96b",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-22-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index ba5e4ad8331..d2727ea2584 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9c2",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c2",
       "interface": "InfiniBand",
       "ip": "172.16.18.73",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9c2",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-23-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index e62fd98a8cf..11afa61d9a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.74",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-24-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.74",
-      "mac": "",
+      "mac": "08:00:38:35:a4:13",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index c60ad542f2f..07970485bcc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c815",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:15",
       "interface": "InfiniBand",
       "ip": "172.16.18.75",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c815",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-25-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 39e249c933f..9f974f173e0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c8ff",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ff",
       "interface": "InfiniBand",
       "ip": "172.16.18.76",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c8ff",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-26-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.76",
-      "mac": "",
+      "mac": "08:00:38:35:a3:aa",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index 75e0e8b8009..27d8ef7c42e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca5e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5e",
       "interface": "InfiniBand",
       "ip": "172.16.18.77",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca5e",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-27-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index d8b85086953..7d865627a49 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca6d",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:6d",
       "interface": "InfiniBand",
       "ip": "172.16.18.78",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca6d",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-28-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index e37138ffbe3..9411edfe272 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c99e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9e",
       "interface": "InfiniBand",
       "ip": "172.16.18.79",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c99e",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-29-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index f6d8c8f75b4..0d7a808c432 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.53",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-3-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 36d13910465..6fa548aa2c6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.80",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-30-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 719e5ad5009..94a753a5c81 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.81",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-31-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 7b3c6478d2b..35ddcabbaa4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c8ea",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ea",
       "interface": "InfiniBand",
       "ip": "172.16.18.82",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c8ea",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-32-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index bda1bc7f045..f485c49f922 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.83",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-33-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index 718eef6ad8a..ea2fa368712 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.84",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-34-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 9501559b471..56aaeb9cac0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c914",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:14",
       "interface": "InfiniBand",
       "ip": "172.16.18.85",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c914",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-35-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index dd08c78c090..5ccf8ec0cc9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.86",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-36-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 35d2a5b8aed..e6a51c03c39 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.87",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-37-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index ee2d26fd6df..0ae769734be 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9bc",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bc",
       "interface": "InfiniBand",
       "ip": "172.16.18.88",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9bc",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-38-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index feb2ec5a606..26f768678be 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca40",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:40",
       "interface": "InfiniBand",
       "ip": "172.16.18.89",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca40",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-39-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index d9e798d7250..ccbffd2db70 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.54",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-4-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.54",
-      "mac": null,
+      "mac": "08:00:38:36:9f:26",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index b66b46d8e86..3fd3cc8b1bd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c97d",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:7d",
       "interface": "InfiniBand",
       "ip": "172.16.18.90",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c97d",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-40-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index 5e7eb48645d..c435c05f161 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.91",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-41-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index e9c3c8a5219..c7fd00398b8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(01/12/2010)",
+    "vendor": "Thurley",
+    "version": "3.59.48.0028_BUILD_INCA_0014"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x08003800013729c5",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:29:c5",
       "interface": "InfiniBand",
       "ip": "172.16.18.92",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x08003800013729c5",
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -44,32 +52,32 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.92",
-      "mac": "08:00:38:35:ad:be",
+      "mac": "08:00:38:36:cf:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-42-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "",
+      "mac": "08:00:38:36:cf:d9",
       "management": false,
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.92",
-      "mac": "",
+      "mac": "08:00:38:36:9d:ec",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 91dae386c00..3d26aa74899 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.93",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-43-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index 481fa3bdfd0..564a1620034 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c980",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:80",
       "interface": "InfiniBand",
       "ip": "172.16.18.94",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c980",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-44-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index b32d16a3176..7b2e36ee808 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca34",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:34",
       "interface": "InfiniBand",
       "ip": "172.16.18.95",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca34",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-45-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index b133a5802ae..24928b807d2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.96",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-46-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 4529fe21669..3c333a52d0e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c99b",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9b",
       "interface": "InfiniBand",
       "ip": "172.16.18.97",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c99b",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-47-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index de54ab51fab..d893ec5ec0f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c929",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:29",
       "interface": "InfiniBand",
       "ip": "172.16.18.98",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c929",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-48-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index 48b077bc947..1a121c5dd02 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c992",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:92",
       "interface": "InfiniBand",
       "ip": "172.16.18.99",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c992",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-49-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 4f73be60eea..fe130447f51 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.55",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-5-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 858aabf2de8..c6dd01ff17b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca19",
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.100",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca19",
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-50-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
-      "ip": "192.168.2.100",
-      "mac": "",
+      "ip": "172.16.18.100",
+      "mac": "00:08:f1:20:07:b8",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 0567dcacb53..ba89d59def4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca61",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:61",
       "interface": "InfiniBand",
       "ip": "172.16.18.101",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca61",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-51-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index c7375226fc7..2ed5415eba1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca28",
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.102",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca28",
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-52-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index f0d7537f27c..e69e7911e8c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca4f",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:4f",
       "interface": "InfiniBand",
       "ip": "172.16.18.103",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca4f",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-53-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index d9ff5e73782..e2d9ba49b98 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca58",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:58",
       "interface": "InfiniBand",
       "ip": "172.16.18.104",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca58",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-54-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 51d02c0ebc9..35cfcccac5f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9dd",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:dd",
       "interface": "InfiniBand",
       "ip": "172.16.18.105",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9dd",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-55-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 6c9d07394bf..8b3e4ee377c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca01",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:01",
       "interface": "InfiniBand",
       "ip": "172.16.18.106",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca01",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-56-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 3ef3ca9c064..d44b865cb58 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c986",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:86",
       "interface": "InfiniBand",
       "ip": "172.16.18.107",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c986",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-57-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index 1f7b7c47f33..936b5da05e7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca0d",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0d",
       "interface": "InfiniBand",
       "ip": "172.16.18.108",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca0d",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-58-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index d9bf6e6d664..decfdd9fe24 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c908",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:08",
       "interface": "InfiniBand",
       "ip": "172.16.18.109",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c908",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-59-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index c7590c68f12..ac6f02e4eaa 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca7f",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:7f",
       "interface": "InfiniBand",
       "ip": "172.16.18.56",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca7f",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-6-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index f93729ee0ba..b960a96f662 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca37",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:37",
       "interface": "InfiniBand",
       "ip": "172.16.18.110",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca37",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-60-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index 5c55491594f..7fbfce8cbbe 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c90b",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:0b",
       "interface": "InfiniBand",
       "ip": "172.16.18.111",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c90b",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-61-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 3aa0da3b0b4..483da5d18ff 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9c8",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c8",
       "interface": "InfiniBand",
       "ip": "172.16.18.112",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9c8",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-62-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index 6ad4322c14e..4d2b23bbf32 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c98c",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c",
       "interface": "InfiniBand",
       "ip": "172.16.18.113",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c98c",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-63-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index f69d71518de..5819e39a114 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135cc9e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:cc:9e",
       "interface": "InfiniBand",
       "ip": "172.16.18.114",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135cc9e",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -44,32 +52,32 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.114",
-      "mac": "08:00:38:35:aa:20",
+      "mac": "08:00:38:35:ad:be",
       "management": false,
       "mountable": true,
       "mounted": true,
       "network_address": "edel-64-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "08:00:38:35:aa:21",
+      "mac": "08:00:38:35:ad:bf",
       "management": false,
       "mountable": false,
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.114",
-      "mac": "08:00:38:35:a3:10",
+      "mac": "08:00:38:35:a4:df",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 3cb412d4f3c..0c33403156e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9d7",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:d7",
       "interface": "InfiniBand",
       "ip": "172.16.18.115",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9d7",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-65-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.115",
-      "mac": "",
+      "mac": "08:00:38:35:a3:f2",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index 18b9f92958f..365dbba36ce 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca1f",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:1f",
       "interface": "InfiniBand",
       "ip": "172.16.18.116",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca1f",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-66-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index 108230c46b3..e6eb8671736 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9f8",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:f8",
       "interface": "InfiniBand",
       "ip": "172.16.18.117",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9f8",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-67-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 77e7bf9300d..5fb5d21e203 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c989",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:89",
       "interface": "InfiniBand",
       "ip": "172.16.18.118",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c989",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-68-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 981503d9487..0728a4cae0f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca9d",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9d",
       "interface": "InfiniBand",
       "ip": "172.16.18.119",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca9d",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-69-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.119",
-      "mac": "",
+      "mac": "08:00:38:35:a4:34",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index ead43b06aba..19d95457fb1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c8e1",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:e1",
       "interface": "InfiniBand",
       "ip": "172.16.18.57",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c8e1",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-7-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index 5a32afd8dda..35eb0854557 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135ca9a",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9a",
       "interface": "InfiniBand",
       "ip": "172.16.18.120",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135ca9a",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-70-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index d0ad7985cb6..099806690d5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c91a",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:1a",
       "interface": "InfiniBand",
       "ip": "172.16.18.121",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c91a",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-71-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,13 +71,13 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.121",
-      "mac": "",
+      "mac": "08:00:38:35:a3:b3",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index dc743c7b28b..02a7f368206 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.122",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": null,
+      "enabled": false,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-72-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index 935fcb975fe..ef9211df25d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c902",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:02",
       "interface": "InfiniBand",
       "ip": "172.16.18.58",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c902",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-8-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index 88e2acb716c..2ac7e1f078e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(22/06/2009)",
+    "vendor": "Thurley",
+    "version": "3.57.51.0016_BUILD_INCA_0009"
+  },
+  "chassis": {
+    "name": "bullx B500 blade",
+    "serial": 123456789
+  },
   "main_memory": {
     "ram_size": 25769803776,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x080038000135c9c5",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c5",
       "interface": "InfiniBand",
       "ip": "172.16.18.59",
       "management": false,
@@ -27,12 +36,11 @@
     {
       "device": "ib1",
       "driver": "mlx4_core",
-      "enabled": true,
-      "ib_guid": "0x080038000135c9c5",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00",
       "interface": "InfiniBand",
-      "ip": "",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 40000000000,
       "vendor": "Mellanox",
@@ -51,7 +59,7 @@
       "network_address": "edel-9-eth0.grenoble.grid5000.fr",
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "device": "eth1",
@@ -63,7 +71,7 @@
       "mounted": false,
       "rate": 1000000000,
       "vendor": "Intel",
-      "version": "Device 10e7 (rev 01)"
+      "version": "82576 Gigabit Network Connection"
     },
     {
       "enabled": true,
@@ -80,9 +88,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -98,9 +107,10 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ahci",
       "interface": "SATA",
-      "size": 55879354476.92871
+      "model": "C200-MTFDBAA060M",
+      "size": 55879354476.9287
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index 1eb77a0de08..836ae38939c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.1",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 3f7479eec69..8dbeec6d57b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.10",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index c2a7c585045..2b78d38dc30 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00188"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015431,0x0002c90300015432",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:31",
       "interface": "InfiniBand",
       "ip": "172.16.18.11",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:54:32",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 9a0687959a6..4bf6eba6c47 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000159a1,0x0002c903000159a2",
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.12",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.112",
-      "mac": "",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "genepi-12-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index b7b22f8d834..9fdb56a2b6f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00189"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155c9,0x0002c903000155ca",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c9",
       "interface": "InfiniBand",
       "ip": "172.16.18.13",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ca",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index 03089825411..8ded95cd756 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00189"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155cd,0x0002c903000155ce",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:cd",
       "interface": "InfiniBand",
       "ip": "172.16.18.14",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ce",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index a731f6a761c..af21d830add 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00190"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155d9,0x0002c903000155da",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d9",
       "interface": "InfiniBand",
       "ip": "172.16.18.15",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:da",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index 4fa7d0b5485..104962874ba 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00190"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155e9,0x0002c903000155ea",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e9",
       "interface": "InfiniBand",
       "ip": "172.16.18.16",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ea",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index b14fc36c00e..0a4043ebc04 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00191"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155e1,0x0002c903000155e2",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e1",
       "interface": "InfiniBand",
       "ip": "172.16.18.17",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e2",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index 394cb972d2e..27ed30511c7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00119"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155d5,0x0002c903000155d6",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d5",
       "interface": "InfiniBand",
       "ip": "172.16.18.18",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d6",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index f765ca8840d..a5502a26a3d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00192"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c9030001565d,0x0002c9030001565e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5d",
       "interface": "InfiniBand",
       "ip": "172.16.18.19",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5e",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index 2e775d1d26c..6bf31f629c8 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00183"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000158d5,0x0002c903000158d6",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d5",
       "interface": "InfiniBand",
       "ip": "172.16.18.2",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:d6",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index 3dd144c4167..f3a41ccf522 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00192"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155e5,0x0002c903000155e6",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e5",
       "interface": "InfiniBand",
       "ip": "172.16.18.20",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:e6",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index bd9326eaf08..9f3ec9ff797 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00193"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155d1,0x0002c903000155d2",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d1",
       "interface": "InfiniBand",
       "ip": "172.16.18.21",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:d2",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index c67e5e1c096..261e1befb2d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00193"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155c1,0x0002c903000155c2",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c1",
       "interface": "InfiniBand",
       "ip": "172.16.18.22",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:c2",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.122",
-      "mac": "",
+      "mac": "00:30:48:96:d2:fd",
       "management": true,
       "mountable": false,
       "network_address": "genepi-22-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index 51a9fce8b0e..5644ff0bfc5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00194"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015631,0x0002c90300015632",
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.23",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index f58042fe970..ed05e1211c0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00194"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015b01,0x0002c90300015b02",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:01",
       "interface": "InfiniBand",
       "ip": "172.16.18.24",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:02",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index 549112a1f68..8da006e872d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.25",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index cfc9c5cc5ba..1f2388dcb91 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.26",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index 0b31c98f7ed..73c7ef46233 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00196"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015731,0x0002c90300015732",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:31",
       "interface": "InfiniBand",
       "ip": "172.16.18.27",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:32",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index 88d4cbe5571..cd0ff172a4b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00196"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015659,0x0002c9030001565a",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:59",
       "interface": "InfiniBand",
       "ip": "172.16.18.28",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5a",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.128",
-      "mac": "",
+      "mac": "00:30:48:96:d7:76",
       "management": true,
       "mountable": false,
       "network_address": "genepi-28-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 9693361ed28..329b2928bd8 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00197"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155b5,0x0002c903000155b6",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b5",
       "interface": "InfiniBand",
       "ip": "172.16.18.29",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:b6",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index 7568725333a..4cbcbc1e3c8 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.3",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index 4b527d4b92b..49e6ccd6c1d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00197"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015661,0x0002c90300015662",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:61",
       "interface": "InfiniBand",
       "ip": "172.16.18.30",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:62",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 69635ac8715..dbc5c31a574 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,9 +22,9 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
-      "ip": "172.16.18.31",
+      "ip": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -24,11 +33,24 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "",
+      "mac": null,
       "management": false,
       "rate": 1000000000,
       "vendor": "Intel",
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.131",
-      "mac": "",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "genepi-31-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index a1e34b19317..0f70ad68a2d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00198"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000155ed,0x0002c903000155ee",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ed",
       "interface": "InfiniBand",
       "ip": "172.16.18.32",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:55:ee",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index f320708c527..898f4c8fc35 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00199"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015805,0x0002c90300015806",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:05",
       "interface": "InfiniBand",
       "ip": "172.16.18.33",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:06",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index 11d058c12d9..c3041f415a2 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00199"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015655,0x0002c90300015656",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:55",
       "interface": "InfiniBand",
       "ip": "172.16.18.34",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:56",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 75744c2f7b9..3a9fce9464f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00184"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000158bd,0x0002c903000158be",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:bd",
       "interface": "InfiniBand",
       "ip": "172.16.18.4",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:58:be",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -40,7 +62,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.4",
-      "mac": "00:30:48:7F:44:8D",
+      "mac": "00:30:48:7f:44:8d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.104",
-      "mac": "",
+      "mac": "00:30:48:96:d2:5d",
       "management": true,
       "mountable": false,
       "network_address": "genepi-4-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index a5ac5214f88..525a6a611a0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00185"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015b0d,0x0002c90300015b0e",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0d",
       "interface": "InfiniBand",
       "ip": "172.16.18.5",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:0e",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.105",
-      "mac": "",
+      "mac": "00:30:48:93:39:e8",
       "management": true,
       "mountable": false,
       "network_address": "genepi-5-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index b241608aa1e..1ca6af2c0c0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": null,
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.6",
       "management": false,
@@ -24,11 +33,24 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "",
+      "mac": null,
       "management": false,
       "rate": 1000000000,
       "vendor": "Intel",
@@ -53,7 +75,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.106",
-      "mac": "",
+      "mac": null,
       "management": true,
       "mountable": false,
       "network_address": "genepi-6-bmc.grenoble.grid5000.fr",
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index c517712b3cb..2700f87d840 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": null
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c903000159ad,0x0002c903000159ae",
+      "guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.7",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": null,
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 79716159c26..d2174c2dbb1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5S-00186"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015b19,0x0002c90300015b1a",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:19",
       "interface": "InfiniBand",
       "ip": "172.16.18.8",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:1a",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index c5788eed9da..43698837fd1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -4,6 +4,15 @@
     "smp_size": 2,
     "smt_size": 8
   },
+  "bios": {
+    "release_date": "(04/30/2008)",
+    "vendor": "Phoenix Technologies LTD",
+    "version": "1.1a"
+  },
+  "chassis": {
+    "name": "R422E1/R422E1INF",
+    "serial": "XAN-SM5P-00187"
+  },
   "main_memory": {
     "ram_size": 8589934592,
     "virtual_size": null
@@ -13,7 +22,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
-      "ib_guid": "0x0002c90300015b15,0x0002c90300015b16",
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:15",
       "interface": "InfiniBand",
       "ip": "172.16.18.9",
       "management": false,
@@ -24,6 +33,19 @@
       "vendor": "Mellanox",
       "version": "InfiniHost MHGH29-XTC"
     },
+    {
+      "device": "ib1",
+      "driver": "mlx4_core",
+      "enabled": false,
+      "guid": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:5b:16",
+      "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
+      "rate": 10000000000,
+      "vendor": "Mellanox",
+      "version": "InfiniHost MHGH29-XTC"
+    },
     {
       "device": "eth0",
       "enabled": false,
@@ -63,9 +85,10 @@
     }
   ],
   "operating_system": {
-    "name": null,
-    "release": null,
-    "version": null
+    "kernel": "2.6.32",
+    "name": "Debian",
+    "release": "Squeeze",
+    "version": "6.0"
   },
   "processor": {
     "cache_l1": null,
@@ -81,9 +104,11 @@
   },
   "storage_devices": [
     {
-      "driver": null,
+      "driver": "ata_piix",
       "interface": "SATA",
-      "size": 149011611938.47656
+      "model": "WD1600YS-01S",
+      "size": 149011611938.477,
+      "vendor": "Western Digital"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json
index 54b0463f4e9..66bd1596b21 100755
--- a/data/grid5000/sites/grenoble/grenoble.json
+++ b/data/grid5000/sites/grenoble/grenoble.json
@@ -1,14 +1,15 @@
 {
-  "description": "",
-  "email_contact": null,
+  "compilation_server": false,
+  "description": "Grid'5000 Grenoble site",
+  "email_contact": "grenoble-staff@lists.grid5000.fr",
   "latitude": 45.1833,
   "location": "Grenoble, France",
   "longitude": 5.7167,
   "name": "Grenoble",
-  "security_contact": null,
-  "sys_admin_contact": null,
+  "security_contact": "grenoble-staff@lists.grid5000.fr",
+  "sys_admin_contact": "grenoble-staff@lists.grid5000.fr",
   "type": "site",
   "uid": "grenoble",
-  "user_support_contact": null,
-  "web": null
+  "user_support_contact": "grenoble-staff@lists.grid5000.fr",
+  "web": "http://www.grid5000.fr/mediawiki/index.php/Grenoble:Home"
 }
\ No newline at end of file
-- 
GitLab