diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index 491e1019b672b0f5886e8b05a03c0482a630d8ac..a270724457dcd438731d8539c7885b516eb2c36c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530006
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.1",
-      "mac": "00:E0:81:B2:C1:88",
+      "ip6": "fe80::2e0:81ff:feb2:c188",
+      "mac": "00:e0:81:b2:c1:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:89",
+      "mac": "00:e0:81:b2:c1:89",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:f2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.1",
-      "mac": "00:E0:81:4F:E3:13",
+      "mac": "00:e0:81:4f:e3:13",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-1-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-1-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/1",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530006,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index 6d046d48a090c4d7845a3009787f5fe271a63426..6824fb5c0a401dd7abca0cace741e6b1e163c0c4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530015
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.10",
-      "mac": "00:E0:81:B2:C0:A4",
+      "ip6": "fe80::2e0:81ff:feb2:c0a4",
+      "mac": "00:e0:81:b2:c0:a4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:A5",
+      "mac": "00:e0:81:b2:c0:a5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "device": "ib1",
+      "driver": "mlx4_core",
       "enabled": false,
       "guid": null,
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.10",
-      "mac": "00:E0:81:4F:CA:9E",
+      "mac": "00:e0:81:4f:ca:9e",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-10-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-10-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/10",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530015,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 12996dae5630c26f4c84aafea28c9e50260f572d..019e84d9df72d5a84313877611d47ce9199f72fb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530016
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.11",
-      "mac": "00:E0:81:B2:C2:4C",
+      "ip6": "fe80::2e0:81ff:feb2:c24c",
+      "mac": "00:e0:81:b2:c2:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:4D",
+      "mac": "00:e0:81:b2:c2:4d",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:da",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.11",
-      "mac": "00:E0:81:4F:E3:70",
+      "mac": "00:e0:81:4f:e3:70",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-11-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-11-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/25",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530016,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index 7a8b4d3dd3f0b9837d9127b2db157f000644eb03..b6e3931171c83c3e559ecbbda3372134d66cb791 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530017
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.12",
-      "mac": "00:E0:81:B2:C1:9E",
+      "ip6": "fe80::2e0:81ff:feb2:c19e",
+      "mac": "00:e0:81:b2:c1:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:9F",
+      "mac": "00:e0:81:b2:c1:9f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:de",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.12",
-      "mac": "00:E0:81:4F:CA:8B",
+      "mac": "00:e0:81:4f:ca:8b",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-12-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-12-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/26",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530017,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 9d4d6210784c659e4fb6e7b1bb26a4dd18acbb11..eb33052b8b2801a58c9c2743d5b1e2887cfc2cb5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530018
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.13",
-      "mac": "00:E0:81:B2:C1:E4",
+      "ip6": "fe80::2e0:81ff:feb2:c1e4",
+      "mac": "00:e0:81:b2:c1:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:E5",
+      "mac": "00:e0:81:b2:c1:e5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:be",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.13",
-      "mac": "00:E0:81:4F:E2:D4",
+      "mac": "00:e0:81:4f:e2:d4",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-13-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-13-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/27",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530018,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 336af3fa5de79f5c70795601d2c051f794e76df7..9a3aba565e158bf0d892b838fa6a01470c76882b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530019
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.14",
-      "mac": "00:E0:81:B1:C0:60",
+      "ip6": "fe80::2e0:81ff:feb1:c060",
+      "mac": "00:e0:81:b1:c0:60",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B1:C0:61",
+      "mac": "00:e0:81:b1:c0:61",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:ce",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.14",
-      "mac": "00:E0:81:4F:E2:C5",
+      "mac": "00:e0:81:4f:e2:c5",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-14-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-14-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/28",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530019,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 09d76e158b4c519a05e5f2f764e19cc6e9d80d8e..5d9b5482b6b7d5f12a92b5ef20d1319beab1c503 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530020
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.15",
-      "mac": "00:E0:81:B2:C4:C4",
+      "ip6": "fe80::2e0:81ff:feb2:c4c4",
+      "mac": "00:e0:81:b2:c4:c4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:C5",
+      "mac": "00:e0:81:b2:c4:c5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:b6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.15",
-      "mac": "00:E0:81:4F:E3:87",
+      "mac": "00:e0:81:4f:e3:87",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-15-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-15-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/29",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530020,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 6a65c84be3e134f719e00d7ed1575bcfd3b7d320..60874c8043b8ae17f0074c16c12f3aa3b5f3ece9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530021
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.16",
-      "mac": "00:E0:81:B2:BF:A0",
+      "ip6": "fe80::2e0:81ff:feb2:bfa0",
+      "mac": "00:e0:81:b2:bf:a0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:A1",
+      "mac": "00:e0:81:b2:bf:a1",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:40",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.16",
-      "mac": "00:E0:81:4F:E2:D8",
+      "mac": "00:e0:81:4f:e2:d8",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-16-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-16-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/30",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530021,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index b767f4ab4fef4628a3344cf8194a8329b8611019..0fc2cf94b556bcc4c42f6c49fd9166d091149fdf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530022
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.17",
-      "mac": "00:E0:81:B2:C2:18",
+      "ip6": "fe80::2e0:81ff:feb2:c218",
+      "mac": "00:e0:81:b2:c2:18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:19",
+      "mac": "00:e0:81:b2:c2:19",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:18",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.17",
-      "mac": "00:E0:81:4F:E3:6A",
+      "mac": "00:e0:81:4f:e3:6a",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-17-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-17-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/31",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530022,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index 052ff63dfbcb86c0148c388581f08f041fa37ef5..457405322633874656a13a7bd8bbca1c37eb9fba 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530023
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.18",
-      "mac": "00:E0:81:B2:C2:04",
+      "ip6": "fe80::2e0:81ff:feb2:c204",
+      "mac": "00:e0:81:b2:c2:04",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:05",
+      "mac": "00:e0:81:b2:c2:05",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:2c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.18",
-      "mac": "00:E0:81:4F:CB:0E",
+      "mac": "00:e0:81:4f:cb:0e",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-18-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-18-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/32",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530023,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index 7985c30ecbe7a79dd248db52e040f8350b37c530..a48afa5ff0a32c7cee220af3cff8e3f8533a8d1c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530024
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.19",
-      "mac": "00:E0:81:B2:C5:60",
+      "ip6": "fe80::2e0:81ff:feb2:c560",
+      "mac": "00:e0:81:b2:c5:60",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:61",
+      "mac": "00:e0:81:b2:c5:61",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:38",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.19",
-      "mac": "00:E0:81:4F:E3:00",
+      "mac": "00:e0:81:4f:e3:00",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-19-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-19-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/33",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530024,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index f647db5c882c0519692da208c04b0ddcde64adbe..a22b0435596cf9c2f5cc3ddd03afe58d0a9ae609 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530007
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.2",
-      "mac": "00:E0:81:B2:C4:BC",
+      "ip6": "fe80::2e0:81ff:feb2:c4bc",
+      "mac": "00:e0:81:b2:c4:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:BD",
+      "mac": "00:e0:81:b2:c4:bd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:66",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.2",
-      "mac": "00:E0:81:4F:E2:FC",
+      "mac": "00:e0:81:4f:e2:fc",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-2-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-2-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/2",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530007,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index 735d9bf1960e6f4f0f2db75e5e3202521fd2a15b..eae9cbecc009351de976faa924ce693eb8fc0249 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530025
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.20",
-      "mac": "00:E0:81:B2:C5:74",
+      "ip6": "fe80::2e0:81ff:feb2:c574",
+      "mac": "00:e0:81:b2:c5:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:75",
+      "mac": "00:e0:81:b2:c5:75",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:2f:cc",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.20",
-      "mac": "00:E0:81:4F:CA:8E",
+      "mac": "00:e0:81:4f:ca:8e",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-20-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-20-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/34",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530025,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index df7ed07cb3543caca80635753a5e12f662001f13..1244223dab61a7527459106f3b5d25e41dda3b20 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530026
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.21",
-      "mac": "00:E0:81:B2:BF:C2",
+      "ip6": "fe80::2e0:81ff:feb2:bfc2",
+      "mac": "00:e0:81:b2:bf:c2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:CD",
+      "mac": "00:e0:81:b2:bf:cd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:50",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.21",
-      "mac": "00:E0:81:4F:E2:FB",
+      "mac": "00:e0:81:4f:e2:fb",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-21-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-21-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/35",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530026,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index e5c122f750fab1a5d18e81e73e94d27fee1c513f..ffea8133cab671a84b08f986be841a993d6123ea 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530027
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.22",
-      "mac": "00:E0:81:B2:BF:A6",
+      "ip6": "fe80::2e0:81ff:feb2:bfa6",
+      "mac": "00:e0:81:b2:bf:a6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:A7",
+      "mac": "00:e0:81:b2:bf:a7",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:34",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.22",
-      "mac": "00:E0:81:4F:CB:02",
+      "mac": "00:e0:81:4f:cb:02",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-22-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-22-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/36",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530027,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index 1532d016acf2742ffca3ba9515f6f04bf305a82a..4cc022e93d2e023b820fb03b762618762e1aa37b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530028
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.23",
-      "mac": "00:E0:81:B2:C1:56",
+      "ip6": "fe80::2e0:81ff:feb2:c156",
+      "mac": "00:e0:81:b2:c1:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:57",
+      "mac": "00:e0:81:b2:c1:57",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:30",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.23",
-      "mac": "00:E0:81:4F:CA:7E",
+      "mac": "00:e0:81:4f:ca:7e",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-23-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-23-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/O/37",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530028,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index ca30c79d5a98a4978f5eacc63d13c2ac6975c85a..13e2dfc41e92cf7e7a923db765d8ff3625772d05 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530029
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.24",
-      "mac": "00:E0:81:B2:C2:2E",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c2:2e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:2F",
+      "mac": "00:e0:81:b2:c2:2f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:2f:d8",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.24",
-      "mac": "00:E0:81:4F:CA:7F",
+      "mac": "00:e0:81:4f:ca:7f",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-24-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-24-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/38",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530029,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index f04c705bafd7eec913d1d0e1fdfa721fb2754b26..b562fab9df9939baeb34099b318f5c7b19197381 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530030
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.25",
-      "mac": "00:E0:81:B2:BF:E2",
+      "ip6": "fe80::2e0:81ff:feb2:bfe2",
+      "mac": "00:e0:81:b2:bf:e2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:E3",
+      "mac": "00:e0:81:b2:bf:e3",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:24",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.25",
-      "mac": "00:E0:81:4F:E3:BA",
+      "mac": "00:e0:81:4f:e3:ba",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-25-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-25-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/39",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530030,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index f2be94f97ae808b0b49a02b86dca5a4de2500a7c..bfa5ae9bbfc09b1474ba7ece300a5ef3301bfdbd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530031
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867958784,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.26",
-      "mac": "00:E0:81:B2:C1:C8",
+      "ip6": "fe80::2e0:81ff:feb2:c1c8",
+      "mac": "00:e0:81:b2:c1:c8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:C9",
+      "mac": "00:e0:81:b2:c1:c9",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:2f:d4",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.26",
-      "mac": "00:E0:81:4F:B5:DA",
+      "mac": "00:e0:81:4f:b5:da",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-26-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-26-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/40",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530031,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index c23c59186fd3634940bbcb35a6365d2082bf9dfe..5fc8dfd802249b9ab78264b773d7eb86bff47714 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530032
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.27",
-      "mac": "00:E0:81:B2:C0:C4",
+      "ip6": "fe80::2e0:81ff:feb2:c0c4",
+      "mac": "00:e0:81:b2:c0:c4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:C5",
+      "mac": "00:e0:81:b2:c0:c5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:20",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.27",
-      "mac": "00:E0:81:4F:E2:CB",
+      "mac": "00:e0:81:4f:e2:cb",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-27-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-27-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/41",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530032,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index 8a15b9e6cf22d292a1be9f2fa4d6e2db6a506386..2a44b846fc29d7456bd46d2a71381f2b60c333d1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530033
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.28",
-      "mac": "00:E0:81:B2:C0:5E",
+      "ip6": "fe80::2e0:81ff:feb2:c05e",
+      "mac": "00:e0:81:b2:c0:5e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:E6",
+      "mac": "00:e0:81:b2:c0:e6",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:2f:dc",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.28",
-      "mac": "00:E0:81:4F:CA:8D",
+      "mac": "00:e0:81:4f:ca:8d",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-28-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-28-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/42",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530033,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index 7723162e284e57a5126f96d259b98f72dedbb503..e584297296c2ab7d2c15e5bf27a7f4e93c89e958 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530034
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.29",
-      "mac": "00:E0:81:B2:C4:B0",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c4:b0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:B1",
+      "mac": "00:e0:81:b2:c4:b1",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:44",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.29",
-      "mac": "00:E0:81:4F:E3:71",
+      "mac": "00:e0:81:4f:e3:71",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-29-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-29-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/43",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530034,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index bc0cc6c930c4a33102f700df5e5d0d4db1ebc094..2bcf30526ebde092843a1b6a251d987f351609a0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530008
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.3",
-      "mac": "00:E0:81:B2:C1:FE",
+      "ip6": "fe80::2e0:81ff:feb2:c1fe",
+      "mac": "00:e0:81:b2:c1:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:FF",
+      "mac": "00:e0:81:b2:c1:ff",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:7f:62",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.3",
-      "mac": "00:E0:81:4F:CB:0A",
+      "mac": "00:e0:81:4f:cb:0a",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-3-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-3-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/3",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530008,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
index 04e4c8a396759f218a63b8ca27bad138b8e9c946..5fb7b7c4fc2a460ab2e6f6e8dc63f4b34513e0bf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530035
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.30",
-      "mac": "00:E0:81:B2:C0:B4",
+      "ip6": "fe80::2e0:81ff:feb2:c0b4",
+      "mac": "00:e0:81:b2:c0:b4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:B5",
+      "mac": "00:e0:81:b2:c0:b5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:3c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.30",
-      "mac": "00:E0:81:4F:E3:10",
+      "mac": "00:e0:81:4f:e3:10",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-30-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-30-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/1",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530035,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
index bff52b47aa124c8e8a2fb65997402ee32fa32ada..8ec1744291013cc0a4332deebe932c395c83ba4d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.04B"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530036
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.31",
-      "mac": "00:E0:81:B2:C2:24",
+      "ip6": "fe80::2e0:81ff:feb2:c224",
+      "mac": "00:e0:81:b2:c2:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:25",
+      "mac": "00:e0:81:b2:c2:25",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:60",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.31",
-      "mac": "00:E0:81:4F:CB:03",
+      "mac": "00:e0:81:4f:cb:03",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-31-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-31-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/2",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530036,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
index 6c87e64ce0a9fb2ea81cb0d72c71bad4c8080a3d..2519444542af21bf1b9c117ed35f21cd3fa5652a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530037
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.32",
-      "mac": "00:E0:81:B2:C5:9E",
+      "ip6": "fe80::2e0:81ff:feb2:c59e",
+      "mac": "00:e0:81:b2:c5:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:9F",
+      "mac": "00:e0:81:b2:c5:9f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:5c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.32",
-      "mac": "00:E0:81:4F:E3:8B",
+      "mac": "00:e0:81:4f:e3:8b",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-32-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-32-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/3",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530037,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
index a4eb0cabd8b4f66e1e2cd72b82c0e62f07fc6ca8..786e0a767db410032475ce41d580e0c70e6a628f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530038
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.33",
-      "mac": "00:E0:81:B2:BF:FA",
+      "ip6": "fe80::2e0:81ff:feb2:bffa",
+      "mac": "00:e0:81:b2:bf:fa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:FB",
+      "mac": "00:e0:81:b2:bf:fb",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:58",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.33",
-      "mac": "00:E0:81:4F:CA:7A",
+      "mac": "00:e0:81:4f:ca:7a",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-33-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-33-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/4",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530038,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
index d8945d93dccf6f730dece9ffb8d7f480b5cd9d3e..2f190ae20954ebf612611fa5a5e44df2047937ac 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530039
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.34",
-      "mac": "00:E0:81:B2:54:D6",
+      "ip6": "fe80::2e0:81ff:feb2:54d6",
+      "mac": "00:e0:81:b2:54:d6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:54:D7",
+      "mac": "00:e0:81:b2:54:d7",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:54",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.34",
-      "mac": "00:E0:81:4F:CB:20",
+      "mac": "00:e0:81:4f:cb:20",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-34-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-34-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/5",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530039,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
index d0bc12c570a0721c4d57c073e941d9fbb438d929..c242d2a60e99c3520b88e9b7adb56f69acc4aa04 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530040
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.35",
-      "mac": "00:E0:81:B2:C4:D4",
+      "ip6": "fe80::2e0:81ff:feb2:c4d4",
+      "mac": "00:e0:81:b2:c4:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:D5",
+      "mac": "00:e0:81:b2:c4:d5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:4c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.35",
-      "mac": "00:E0:81:4F:B5:EA",
+      "mac": "00:e0:81:4f:b5:ea",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-35-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-35-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/6",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530040,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
index 8ede5637bb3166ffd39bd9d92a1c9b7d683f6fbd..927fe2e2911c07f48fa1a1c785ec855560659a70 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530041
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.36",
-      "mac": "00:E0:81:B2:C0:BE",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c0:be",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:BF",
+      "mac": "00:e0:81:b2:c0:bf",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:1c",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.36",
-      "mac": "00:E0:81:4F:B5:E8",
+      "mac": "00:e0:81:4f:b5:e8",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-36-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-36-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": 7,
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530041,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
index f13f91e5144fc3b21ca2d42120a285045ac3c32e..fd6506c1497786035c28c4618814d2cb3e66b709 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530042
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.37",
-      "mac": "00:E0:81:B2:C0:3E",
+      "ip6": "fe80::2e0:81ff:feb2:c03e",
+      "mac": "00:e0:81:b2:c0:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:3F",
+      "mac": "00:e0:81:b2:c0:3f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:5a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.37",
-      "mac": "00:E0:81:4F:E2:D7",
+      "mac": "00:e0:81:4f:e2:d7",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-37-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-37-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/8",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530042,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
index c90011b65aed16553ecd376a131e3fa977ea8594..5f04f25f86694f855a3167767ff354013b9d4bd1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530043
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.38",
-      "mac": "00:E0:81:B2:C1:D8",
+      "ip6": "fe80::2e0:81ff:feb2:c1d8",
+      "mac": "00:e0:81:b2:c1:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:D9",
+      "mac": "00:e0:81:b2:c1:d9",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:de",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.38",
-      "mac": "00:E0:81:4F:E3:68",
+      "mac": "00:e0:81:4f:e3:68",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-38-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-38-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/9",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530043,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
index 8fba588ca9b7f5692731364c465ed48e8cde9cf0..0dec5877821828e5ab7c2e429837fd725e6ca1b1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530044
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.39",
-      "mac": "00:E0:81:B2:C1:FA",
+      "ip6": "fe80::2e0:81ff:feb2:c1fa",
+      "mac": "00:e0:81:b2:c1:fa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:FB",
+      "mac": "00:e0:81:b2:c1:fb",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:ea",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.39",
-      "mac": "00:E0:81:4F:E2:BF",
+      "mac": "00:e0:81:4f:e2:bf",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-39-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-39-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/25",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530044,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 8c46d00b08ef6aa73870a69172169cd9d696e2e3..8480f106b4e0a5c5288d6bafb0a1c8f3b8b4372f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530009
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.4",
-      "mac": "00:E0:81:B2:BF:E4",
+      "ip6": "fe80::2e0:81ff:feb2:bfe4",
+      "mac": "00:e0:81:b2:bf:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:E5",
+      "mac": "00:e0:81:b2:bf:e5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:6a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.4",
-      "mac": "00:E0:81:4F:E3:7A",
+      "mac": "00:e0:81:4f:e3:7a",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-4-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-4-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/4",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530009,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
index cbfa68cac18003068a4bdd17bc99da371f9b99ec..7ebd5c05f9faa29c759387d352bed1c3e4e27d6a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530045
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.40",
-      "mac": "00:E0:81:B2:C0:CC",
+      "ip6": "fe80::2e0:81ff:feb2:c0cc",
+      "mac": "00:e0:81:b2:c0:cc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:CD",
+      "mac": "00:e0:81:b2:c0:cd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:82",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.40",
-      "mac": "00:E0:81:4F:E2:C6",
+      "mac": "00:e0:81:4f:e2:c6",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-40-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-40-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/26",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530045,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
index 59a8efc44da21070f259b3a0cc5c99336cbb1fd6..91a614f1e5dd407d46061ef9ba2f129819fab4af 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530046
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.41",
-      "mac": "00:E0:81:B2:C4:98",
+      "ip6": "fe80::2e0:81ff:feb2:c498",
+      "mac": "00:e0:81:b2:c4:98",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:99",
+      "mac": "00:e0:81:b2:c4:99",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:d6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.41",
-      "mac": "00:E0:81:4F:B5:E1",
+      "mac": "00:e0:81:4f:b5:e1",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-41-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-41-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/27",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530046,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
index c1d1373ab6544d2e216e65b58f7d39ac27ba0ebb..17374f4cfbfe2afbe2b46b324475a38dc05e07ea 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530047
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.42",
-      "mac": "00:E0:81:B2:C1:BA",
+      "ip6": "fe80::2e0:81ff:feb2:c1ba",
+      "mac": "00:e0:81:b2:c1:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:BB",
+      "mac": "00:e0:81:b2:c1:bb",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:d2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.42",
-      "mac": "00:E0:81:4F:E3:65",
+      "mac": "00:e0:81:4f:e3:65",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-42-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-42-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/28",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530047,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
index f25040a6905cb72510c15680c25af0e523ed3126..74180412c39205effd259a00b48d13fd6267ec6c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530048
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.43",
-      "mac": "00:E0:81:B2:C1:F4",
+      "ip6": "fe80::2e0:81ff:feb2:c1f4",
+      "mac": "00:e0:81:b2:c1:f4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:F5",
+      "mac": "00:e0:81:b2:c1:f5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:ba",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.43",
-      "mac": "00:E0:81:4F:B5:E4",
+      "mac": "00:e0:81:4f:b5:e4",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-43-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-43-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/29",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530048,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
index dda2b745fdd79d1089ffc2ca83c393d21b369352..aff74d96ac22b2b1570120f2579fd343a6bc4ba2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530049
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.44",
-      "mac": "00:E0:81:B2:C1:B8",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c1:b8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:B9",
+      "mac": "00:e0:81:b2:c1:b9",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:d6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.44",
-      "mac": "00:E0:81:4F:E2:B7",
+      "mac": "00:e0:81:4f:e2:b7",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-44-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-44-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/30",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530049,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
index 5e5d9a0364b3a60cac2a92a9e08ff85f2efffeb7..5650dc04e0fe501d9ec6033882ed4e5817e8012f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530050
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.45",
-      "mac": "00:E0:81:B2:C4:94",
+      "ip6": "fe80::2e0:81ff:feb2:c494",
+      "mac": "00:e0:81:b2:c4:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:95",
+      "mac": "00:e0:81:b2:c4:95",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:b2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.45",
-      "mac": "00:E0:81:4F:E2:C4",
+      "mac": "00:e0:81:4f:e2:c4",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-45-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-45-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/31",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530050,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
index fbc46b0837d50546ea75e588facf56b4f649cdf7..58e5f6cf2b7fe2044d3ff466aabb81b1726c07b6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530051
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.46",
-      "mac": "00:E0:81:B1:C4:36",
+      "ip6": "fe80::2e0:81ff:feb1:c436",
+      "mac": "00:e0:81:b1:c4:36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B1:C4:37",
+      "mac": "00:e0:81:b1:c4:37",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:aa",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.46",
-      "mac": "00:E0:81:4F:CA:79",
+      "mac": "00:e0:81:4f:ca:79",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-46-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-46-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/32",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530051,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
index 1e14ebdf8b800a5663c0489a6e0a7b3af97055bf..20cd9f8daf0cbab48a17d3398461e81f27e6fdc2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530052
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.47",
-      "mac": "00:E0:81:B1:C4:CC",
+      "ip6": "fe80::2e0:81ff:feb1:c4cc",
+      "mac": "00:e0:81:b1:c4:cc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B1:C4:CD",
+      "mac": "00:e0:81:b1:c4:cd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:e2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.47",
-      "mac": "00:E0:81:4F:E3:0A",
+      "mac": "00:e0:81:4f:e3:0a",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-47-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-47-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/33",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530052,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
index 2404b311986dea5264365bc970ee3d878a653948..f5474907383042a6f50a344fd047667ea47635bf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530053
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.48",
-      "mac": "00:E0:81:B2:C0:8C",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c0:8c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:8D",
+      "mac": "00:e0:81:b2:c0:8d",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:a6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.48",
-      "mac": "00:E0:81:4F:CA:80",
+      "mac": "00:e0:81:4f:ca:80",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-48-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-48-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/34",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530053,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
index c568eee3f2b9be6b55dd6f74480feadaad9426b9..5113b20a4aaa1a1ca5197d5d651a793d4c448d97 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530054
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.49",
-      "mac": "00:E0:81:B2:C2:2C",
+      "ip6": "fe80::2e0:81ff:feb2:c22c",
+      "mac": "00:e0:81:b2:c2:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:2D",
+      "mac": "00:e0:81:b2:c2:2d",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:28",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.49",
-      "mac": "00:E0:81:4F:E2:C9",
+      "mac": "00:e0:81:4f:e2:c9",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-49-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-49-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/35",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530054,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index 2274f757df20ff4b1e190dfd2e5e41f4158d20d1..246cf33f86737b76034969663e0258d162a6e06b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530010
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.5",
-      "mac": "00:E0:81:B2:C1:FC",
+      "ip6": "fe80::2e0:81ff:feb2:c1fc",
+      "mac": "00:e0:81:b2:c1:fc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:FD",
+      "mac": "00:e0:81:b2:c1:fd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:c2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.5",
-      "mac": "00:E0:81:4F:E3:8D",
+      "mac": "00:e0:81:4f:e3:8d",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-5-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-5-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/5",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530010,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
index 24676147963e06150063e132360d1feecca109fb..d868697f055c83c83960a0b72f036d34f2880312 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530055
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.50",
-      "mac": "00:E0:81:B2:C2:10",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c2:10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:11",
+      "mac": "00:e0:81:b2:c2:11",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:d2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.50",
-      "mac": "00:E0:81:4F:E2:FA",
+      "mac": "00:e0:81:4f:e2:fa",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-50-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-50-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/36",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530055,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
index cebf12786cda3eda61e9a9715752fc1dec227166..a67702a6d4e7c909b7fc3419481e27c13e82c751 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530056
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.51",
-      "mac": "00:E0:81:B2:C0:9E",
+      "ip6": "fe80::2e0:81ff:feb2:c09e",
+      "mac": "00:e0:81:b2:c0:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:9F",
+      "mac": "00:e0:81:b2:c0:9f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:ee",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.51",
-      "mac": "00:E0:81:4F:E3:92",
+      "mac": "00:e0:81:4f:e3:92",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-51-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-51-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/37",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530056,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
index f3f98eba71c781088468cf7ccce500ca4b048a2c..ce803668e3d208219b558f8677f73f30f1e06da1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530057
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.52",
-      "mac": "00:E0:81:B2:C4:A8",
+      "ip6": "fe80::2e0:81ff:feb2:c4a8",
+      "mac": "00:e0:81:b2:c4:a8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:A9",
+      "mac": "00:e0:81:b2:c4:a9",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:7f:86",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.52",
-      "mac": "00:E0:81:4F:E3:7E",
+      "mac": "00:e0:81:4f:e3:7e",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-52-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-52-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/38",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530057,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
index 3a9feb864c8c4aa36dc1bf064c4e1576e49a4b88..6b3629d0bc5efccbc6da27eaaba20a49ce92518b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530058
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.53",
-      "mac": "00:E0:81:B2:C0:30",
+      "ip6": "fe80::2e0:81ff:feb2:c030",
+      "mac": "00:e0:81:b2:c0:30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:31",
+      "mac": "00:e0:81:b2:c0:31",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:c6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.53",
-      "mac": "00:E0:81:4F:E3:56",
+      "mac": "00:e0:81:4f:e3:56",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-53-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-53-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/39",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530058,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
index 32341a311c5026a250150bd185f6f9b32385759b..20054f509eace52be24bc606ab48d7c5a4160a36 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": "812530059c"
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867958784,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.54",
-      "mac": "00:E0:81:B2:C0:DA",
+      "ip6": "fe80::2e0:81ff:feb2:c0da",
+      "mac": "00:e0:81:b2:c0:da",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:DB",
+      "mac": "00:e0:81:b2:c0:db",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:04:52:06",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.54",
-      "mac": "00:E0:81:4F:E2:CF",
+      "mac": "00:e0:81:4f:e2:cf",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-54-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-54-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/40",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": "812530059c",
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
index 6f5eaec5eaaba48579fa3588380c6a0cc0c7cc12..2c46ef8e13a190b313f5ee1efbb2ca6d7b3d9ffc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530060
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.55",
-      "mac": "00:E0:81:B2:C2:88",
+      "ip6": "fe80::2e0:81ff:feb2:c288",
+      "mac": "00:e0:81:b2:c2:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:89",
+      "mac": "00:e0:81:b2:c2:89",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:86",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.55",
-      "mac": "00:E0:81:4F:E2:F8",
+      "mac": "00:e0:81:4f:e2:f8",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-55-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-55-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/41",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530060,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
index da44ba6fbc67b244e28ea3eca933b410c0790dbc..369b528324db0e4b56cb6902ac44b41b1eb84d03 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530061
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.56",
-      "mac": "00:E0:81:B2:C1:DC",
+      "ip6": "fe80::2e0:81ff:feb2:c1dc",
+      "mac": "00:e0:81:b2:c1:dc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:DD",
+      "mac": "00:e0:81:b2:c1:dd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:6e",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.56",
-      "mac": "00:E0:81:4F:CA:89",
+      "mac": "00:e0:81:4f:ca:89",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-56-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-56-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/42",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530061,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
index f5285ac0fd2a1aafe1d0ec85272ebf18ba6a42f0..7d28263246423f2fdb04aeb80a308302dfe60f74 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530062
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.57",
-      "mac": "00:E0:81:B2:BF:EC",
+      "ip6": "fe80::2e0:81ff:feb2:bfec",
+      "mac": "00:e0:81:b2:bf:ec",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:ED",
+      "mac": "00:e0:81:b2:bf:ed",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:3e",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.57",
-      "mac": "00:E0:81:4F:E2:DE",
+      "mac": "00:e0:81:4f:e2:de",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-57-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-57-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon2-ipmi",
       "switch_port": "1/0/43",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530062,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index 5e1e0e1a9333e1107c180ae110441f12f567607f..aec1738c9aba09a67931ae94174be2dd02da961d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530063
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.58",
-      "mac": "00:E0:81:B2:C0:28",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c0:28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:29",
+      "mac": "00:e0:81:b2:c0:29",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:9e",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.58",
-      "mac": "00:E0:81:4F:E2:F3",
+      "mac": "00:e0:81:4f:e2:f3",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-58-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-58-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/12",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530063,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index 13561482e3035654d9d34f18f2ebc8f66e34b702..c73e4e3a96e98b09d4e57364e40566bf8c94e904 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530064
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.59",
-      "mac": "00:E0:81:B2:C1:F8",
+      "ip6": "fe80::2e0:81ff:feb2:c1f8",
+      "mac": "00:e0:81:b2:c1:f8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:F9",
+      "mac": "00:e0:81:b2:c1:f9",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:32",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.59",
-      "mac": "00:E0:81:4F:E3:05",
+      "mac": "00:e0:81:4f:e3:05",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-59-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-59-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/11",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530064,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index 739021afce8854d424be5e1e8f66a8290c780da0..cd6dc13d09013852985cf3dfe3f78fb9adb1295e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530011
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.6",
-      "mac": "00:E0:81:B1:C4:7E",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b1:c4:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B1:C4:E8",
+      "mac": "00:e0:81:b1:c4:e8",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:ae",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.6",
-      "mac": "00:E0:81:4F:E3:74",
+      "mac": "00:e0:81:4f:e3:74",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-6-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-6-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/6",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530011,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index e4815b4ad5d2afa11d3fcc1b8d256d13a53949ed..4536c87364a37f59ac1aadcaf9251f7d7d6c1980 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530065
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.60",
-      "mac": "00:E0:81:B2:BF:F4",
+      "ip6": "fe80::2e0:81ff:feb2:bff4",
+      "mac": "00:e0:81:b2:bf:f4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:F5",
+      "mac": "00:e0:81:b2:bf:f5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:42",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.60",
-      "mac": "00:E0:81:4F:E3:90",
+      "mac": "00:e0:81:4f:e3:90",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-60-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-60-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/13",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530065,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
index 13cc505653717bc189112d616aea94847147fd75..a4298f9dc1a94a3b3ac74df432d3a6fb98a3ed77 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530066
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.61",
-      "mac": "00:E0:81:B2:C1:E2",
+      "ip6": "fe80::2e0:81ff:feb2:c1e2",
+      "mac": "00:e0:81:b2:c1:e2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:E3",
+      "mac": "00:e0:81:b2:c1:e3",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:06",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.61",
-      "mac": "00:E0:81:4B:FC:D2",
+      "mac": "00:e0:81:4b:fc:d2",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-61-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-61-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/4",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530066,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
index 303a0d8d6727339063a5d22c2cc8ef036c313179..a0eb0c035f0b9d2a82c3859e1b8a66e648c25532 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530067
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.62",
-      "mac": "00:E0:81:B2:C1:D6",
+      "ip6": "fe80::2e0:81ff:feb2:c1d6",
+      "mac": "00:e0:81:b2:c1:d6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:D7",
+      "mac": "00:e0:81:b2:c1:d7",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:5e",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.62",
-      "mac": "00:E0:81:4F:E2:B8",
+      "mac": "00:e0:81:4f:e2:b8",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-62-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-62-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/5",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530067,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
index 4668e1abc9fde89d95ee45b61c65dd73b988eb58..e6a2b6b1be99ed2ad4bc2925985ac8bac8645874 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530068
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.63",
-      "mac": "00:E0:81:B1:C3:84",
+      "ip6": "fe80::2e0:81ff:feb1:c384",
+      "mac": "00:e0:81:b1:c3:84",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B1:C3:85",
+      "mac": "00:e0:81:b1:c3:85",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:b6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.63",
-      "mac": "00:E0:81:4F:E3:0B",
+      "mac": "00:e0:81:4f:e3:0b",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-63-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-63-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/6",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530068,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
index b71cfe0d68ed64b5725bec50ca3c0d40d0741513..61e1f6e109bd7b18a3869e6e479b120b759c9ca0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530069
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.64",
-      "mac": "00:E0:81:B2:C2:48",
+      "ip6": "fe80::2e0:81ff:feb2:c248",
+      "mac": "00:e0:81:b2:c2:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:49",
+      "mac": "00:e0:81:b2:c2:49",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:30:14",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.64",
-      "mac": "00:E0:81:4F:E2:CD",
+      "mac": "00:e0:81:4f:e2:cd",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-64-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-64-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/7",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530069,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
index 0273a8d3547068380765b52e13f915f4cbb1f49c..abd92d13cdac7e9c4c0347fdbb6d073670d334af 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530070
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.65",
-      "mac": "00:E0:81:B1:C4:D4",
+      "ip6": "fe80::2e0:81ff:feb1:c4d4",
+      "mac": "00:e0:81:b1:c4:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B1:C4:D5",
+      "mac": "00:e0:81:b1:c4:d5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:52",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.65",
-      "mac": "00:E0:81:4F:E2:BC",
+      "mac": "00:e0:81:4f:e2:bc",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-65-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-65-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/8",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530070,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
index 348ad1a6d21f04c7440874d09ba70f238857ddf8..4fa4530c3b81943d9c75aec74567658de5dcf903 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530071
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.66",
-      "mac": "00:E0:81:B2:C0:2E",
+      "ip6": "fe80::2e0:81ff:feb2:c02e",
+      "mac": "00:e0:81:b2:c0:2e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:2F",
+      "mac": "00:e0:81:b2:c0:2f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:19:6a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.66",
-      "mac": "00:E0:81:4F:CA:78",
+      "mac": "00:e0:81:4f:ca:78",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-66-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-66-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/9",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530071,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
index 574b271819592ff33005370a5e219a96eaa8cfcb..b69d288f01453bb3d8d3b6b218c9bcb652c3dfd1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530072
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.67",
-      "mac": "00:E0:81:B2:BF:F2",
+      "ip6": "fe80::2e0:81ff:feb2:bff2",
+      "mac": "00:e0:81:b2:bf:f2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:F3",
+      "mac": "00:e0:81:b2:bf:f3",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:de",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.67",
-      "mac": "00:E0:81:4F:B5:F0",
+      "mac": "00:e0:81:4f:b5:f0",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-67-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-67-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/10",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530072,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
index 9e8687bf1884a75e25b0a0c2cf8f948a28569853..54e8b0ce19891cce01c626f2cd15be3b53ad52e9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530073
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.68",
-      "mac": "00:E0:81:B2:C1:70",
+      "ip6": "fe80::2e0:81ff:feb2:c170",
+      "mac": "00:e0:81:b2:c1:70",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:71",
+      "mac": "00:e0:81:b2:c1:71",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:5a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.68",
-      "mac": "00:E0:81:4F:CA:8F",
+      "mac": "00:e0:81:4f:ca:8f",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-68-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-68-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/11",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530073,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
index b1d894e1b72f1e1396493cf36f9e8a00779ca4a1..5ed5f8380418444b46e2ccb9222caad6e927201a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530074
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.69",
-      "mac": "00:E0:81:B2:C1:3A",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c1:3a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:3B",
+      "mac": "00:e0:81:b2:c1:3b",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -55,7 +66,7 @@
       "ip": "172.18.65.69",
       "management": false,
       "mountable": true,
-      "mounted": true,
+      "mounted": false,
       "network_address": "griffon-69-ib0.nancy.grid5000.fr",
       "rate": 20000000000,
       "switch": "sgriffonib",
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:b2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.69",
-      "mac": "00:E0:81:4F:B5:DC",
+      "mac": "00:e0:81:4f:b5:dc",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-69-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-69-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/12",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530074,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index f132fd5bc12c70bda5acdd0e1a28c5d7c7acff16..ae62a9e33bbafb717e3564b61f100e08854ea958 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530012
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.7",
-      "mac": "00:E0:81:B2:C4:AC",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c4:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:AD",
+      "mac": "00:e0:81:b2:c4:ad",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:56",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.7",
-      "mac": "00:E0:81:4F:CA:90",
+      "mac": "00:e0:81:4f:ca:90",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-7-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-7-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/7",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530012,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
index 48fbf8bc753c8f98ff73c4246c399cead664f901..d3a72a1f3d4b6671baa29907fa26bb8c6a214254 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530075
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.70",
-      "mac": "00:E0:81:B2:BF:8A",
+      "ip6": "fe80::2e0:81ff:feb2:bf8a",
+      "mac": "00:e0:81:b2:bf:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:8B",
+      "mac": "00:e0:81:b2:bf:8b",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:12",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.70",
-      "mac": "00:E0:81:4F:CA:77",
+      "mac": "00:e0:81:4f:ca:77",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-70-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-70-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/13",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530075,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
index 0154d15023951e9b4c4096c3b7f6031a23693ef7..d21e1631e9fedf4f251b1ccbcc408ea5b133bd60 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530076
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.71",
-      "mac": "00:E0:81:B2:BF:CE",
+      "ip6": "fe80::2e0:81ff:feb2:bfce",
+      "mac": "00:e0:81:b2:bf:ce",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:CF",
+      "mac": "00:e0:81:b2:bf:cf",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:26",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.71",
-      "mac": "00:E0:81:4F:CB:05",
+      "mac": "00:e0:81:4f:cb:05",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-71-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-71-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/14",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530076,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
index fe3b23f26de11d9307bf8d41011f65ebad0fc7da..b62eafce5d84445a39a9fa8e4f5ee929703d9aeb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530077
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.72",
-      "mac": "00:E0:81:B2:C4:D6",
+      "ip6": "fe80::2e0:81ff:feb2:c4d6",
+      "mac": "00:e0:81:b2:c4:d6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:D7",
+      "mac": "00:e0:81:b2:c4:d7",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:2f:d0",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.72",
-      "mac": "00:E0:81:4F:B5:F1",
+      "mac": "00:e0:81:4f:b5:f1",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-72-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-72-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/15",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530077,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
index 2e7af08c3bbcf145db8aded4589bf468714db875..e67e65b3f7275a16eb36546ea06b5b61ffd6e498 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530078
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.73",
-      "mac": "00:E0:81:B2:C4:BA",
+      "ip6": "fe80::2e0:81ff:feb2:c4ba",
+      "mac": "00:e0:81:b2:c4:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:BB",
+      "mac": "00:e0:81:b2:c4:bb",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:19:fe",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.73",
-      "mac": "00:E0:81:4F:CB:0D",
+      "mac": "00:e0:81:4f:cb:0d",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-73-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-73-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/25",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530078,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
index 8c4cb6df16c0dbfdc7d9e74f364a32798189f353..e86bbafb908b54445b279d3feb280dda1f867293 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530079
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.74",
-      "mac": "00:E0:81:B2:C0:94",
+      "ip6": "fe80::2e0:81ff:feb2:c094",
+      "mac": "00:e0:81:b2:c0:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:95",
+      "mac": "00:e0:81:b2:c0:95",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:92",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.74",
-      "mac": "00:E0:81:4F:CB:00",
+      "mac": "00:e0:81:4f:cb:00",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-74-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-74-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/26",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530079,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
index 65299f36c2084606e098c0d52602c3643e5948a2..75ba269b871655b2287f6d62386f85aaab5268c7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530080
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.75",
-      "mac": "00:E0:81:B2:C1:D2",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c1:d2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:D3",
+      "mac": "00:e0:81:b2:c1:d3",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:76",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.75",
-      "mac": "00:E0:81:4F:E3:75",
+      "mac": "00:e0:81:4f:e3:75",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-75-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-75-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/27",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530080,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
index d7e979ea76930278795f362b84307705a5173511..83404bf712d785f07255c5d05b63fb7d0399e824 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530081
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.76",
-      "mac": "00:E0:81:B2:C1:24",
+      "ip6": "fe80::2e0:81ff:feb2:c124",
+      "mac": "00:e0:81:b2:c1:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:25",
+      "mac": "00:e0:81:b2:c1:25",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:19:76",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.76",
-      "mac": "00:E0:81:4F:B5:E3",
+      "mac": "00:e0:81:4f:b5:e3",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-76-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-76-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/28",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530081,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
index deb3b2a56074dfdff520f65f8d74a63f0ae84629..b118a0ff299a94b873e389894b2c1fde685d1d23 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530082
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.77",
-      "mac": "00:E0:81:B2:BF:F0",
+      "ip6": "fe80::2e0:81ff:feb2:bff0",
+      "mac": "00:e0:81:b2:bf:f0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:F1",
+      "mac": "00:e0:81:b2:bf:f1",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:ba",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.77",
-      "mac": "00:E0:81:4F:E2:E0",
+      "mac": "00:e0:81:4f:e2:e0",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-77-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-77-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/29",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530082,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
index 94dad99498836563001fad9b9d0e7f782c157334..115338870cce8f2e52b3d2158024bd1b9d1b7639 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530083
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.78",
-      "mac": "00:E0:81:B2:C2:44",
+      "ip6": "fe80::2e0:81ff:feb2:c244",
+      "mac": "00:e0:81:b2:c2:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:45",
+      "mac": "00:e0:81:b2:c2:45",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:17:ae",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.78",
-      "mac": "00:E0:81:4F:E2:E8",
+      "mac": "00:e0:81:4f:e2:e8",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-78-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-78-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/30",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530083,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
index b92a815e72b3d42e3006221b8a9323b1dd6b1bb1..f655531dbb08b30b005aa6550c4f7e19dde84ae1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530084
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867958784,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.79",
-      "mac": "00:E0:81:B2:C4:B8",
+      "ip6": "fe80::2e0:81ff:feb2:c4b8",
+      "mac": "00:e0:81:b2:c4:b8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:B9",
+      "mac": "00:e0:81:b2:c4:b9",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:0a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.79",
-      "mac": "00:E0:81:4F:E2:B2",
+      "mac": "00:e0:81:4f:e2:b2",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-79-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-79-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/31",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530084,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index ad8939507aafdb47d6ffd601ccf11b8e58a1f011..fe24e6153ffc3583470d2a01f7bd9d249e71727f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530013
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.8",
-      "mac": "00:E0:81:B2:C4:A0",
+      "ip6": "fe80::2e0:81ff:feb2:c4a0",
+      "mac": "00:e0:81:b2:c4:a0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:A1",
+      "mac": "00:e0:81:b2:c4:a1",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:ca",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.8",
-      "mac": "00:E0:81:4F:E3:C2",
+      "mac": "00:e0:81:4f:e3:c2",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-8-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-8-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/8",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530013,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
index 459449211775eff3d3809d1341c45839170b6806..809888aa23f518ae49113d73cc4716b36f524609 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530085
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.80",
-      "mac": "00:E0:81:B2:C1:F6",
+      "ip6": "fe80::2e0:81ff:feb2:c1f6",
+      "mac": "00:e0:81:b2:c1:f6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:F7",
+      "mac": "00:e0:81:b2:c1:f7",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:02",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.80",
-      "mac": "00:E0:81:4F:B5:AF",
+      "mac": "00:e0:81:4f:b5:af",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-80-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-80-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/32",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530085,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
index cd13599581c4563ae5079dd4acd45815162534bf..6a3cd3340281b454a488e82422887251b85961f8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530086
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.81",
-      "mac": "00:E0:81:B2:C5:72",
+      "ip6": "fe80::2e0:81ff:feb2:c572",
+      "mac": "00:e0:81:b2:c5:72",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:73",
+      "mac": "00:e0:81:b2:c5:73",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:62",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.81",
-      "mac": "00:E0:81:4F:CA:7D",
+      "mac": "00:e0:81:4f:ca:7d",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-81-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-81-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/33",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530086,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
index 8d78f2730dc46942a4309a55d3d6ae5abff1c99d..81142e260c7caf668ba09dd5f25b6ab3a1c78182 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530087
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.82",
-      "mac": "00:E0:81:B2:C1:7E",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c1:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C1:7F",
+      "mac": "00:e0:81:b2:c1:7f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:19:fa",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.82",
-      "mac": "00:E0:81:4F:CB:08",
+      "mac": "00:e0:81:4f:cb:08",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-82-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-82-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/34",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530087,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
index ae4f969fe77aaeb134323555d49a001002f71ecd..43277e9e9836f64ac7db892db17f5392faf3c952 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530088
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.83",
-      "mac": "00:E0:81:B2:C2:40",
+      "ip6": "fe80::2e0:81ff:feb2:c240",
+      "mac": "00:e0:81:b2:c2:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:41",
+      "mac": "00:e0:81:b2:c2:41",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:19:f6",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.83",
-      "mac": "00:E0:81:4F:CA:9F",
+      "mac": "00:e0:81:4f:ca:9f",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-83-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-83-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/35",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530088,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
index 1c97a7415bcebc735026de49077e787c9c2eb23f..27e193e6d104823db5e9924fd5fea9783db053da 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530089
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.84",
-      "mac": "00:E0:81:B2:C2:4E",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c2:4e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:4F",
+      "mac": "00:e0:81:b2:c2:4f",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:18:0e",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.84",
-      "mac": "00:E0:81:4F:E2:D9",
+      "mac": "00:e0:81:4f:e2:d9",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-84-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-84-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/36",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530089,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
index 3abea4cc88db1f8a5111fa14edab912b41b047e2..cfbe5054d7e675a9f7904ab609024204959216cd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530090
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.85",
-      "mac": "00:E0:81:B2:C5:BC",
+      "ip6": "fe80::2e0:81ff:feb2:c5bc",
+      "mac": "00:e0:81:b2:c5:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:BD",
+      "mac": "00:e0:81:b2:c5:bd",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:19:f2",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.85",
-      "mac": "00:E0:81:4F:B5:E7",
+      "mac": "00:e0:81:4f:b5:e7",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-85-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-85-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/37",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530090,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
index d229193bac76ed8ec66558590289b15d41108ebf..f949904a240cee011e9c91965a8ab4f66ebc2f51 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530091
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.86",
-      "mac": "00:E0:81:B2:C2:3A",
+      "ip6": "fe80::2e0:81ff:feb2:c4ac",
+      "mac": "00:e0:81:b2:c2:3a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C2:3B",
+      "mac": "00:e0:81:b2:c2:3b",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:1a:02",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.86",
-      "mac": "00:E0:81:4F:CB:0F",
+      "mac": "00:e0:81:4f:cb:0f",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-86-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-86-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/39",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530091,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
index 74ced8402337b12f934deaf11a741c7307c1a785..673b83661186f626e20f5b376b475af348e7bbb8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530092
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.87",
-      "mac": "00:E0:81:B2:BF:82",
+      "ip6": "fe80::2e0:81ff:feb2:bf82",
+      "mac": "00:e0:81:b2:bf:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:83",
+      "mac": "00:e0:81:b2:bf:83",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:1a:06",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.87",
-      "mac": "00:E0:81:4F:E2:BD",
+      "mac": "00:e0:81:4f:e2:bd",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-87-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-87-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/40",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530092,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
index 317a426a3445a49b37c37cc703476cdde7c27259..1cad15682dbbfdc7ad39b19d0d20b8596957ab0b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530093
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.88",
-      "mac": "00:E0:81:B2:C4:CE",
+      "ip6": "fe80::2e0:81ff:feb2:c4ce",
+      "mac": "00:e0:81:b2:c4:ce",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C4:CF",
+      "mac": "00:e0:81:b2:c4:cf",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:1a:1a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.88",
-      "mac": "00:E0:81:4F:E3:8C",
+      "mac": "00:e0:81:4f:e3:8c",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-88-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-88-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/41",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530093,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
index cfa40084450fb45eb669a72a17ad99c974d0b10d..5b2c99e1c6b4dd2ddb5205f061beac43cea94a10 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530094
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.89",
-      "mac": "00:E0:81:B2:C5:D4",
+      "ip6": "fe80::2e0:81ff:feb2:c5d4",
+      "mac": "00:e0:81:b2:c5:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:D5",
+      "mac": "00:e0:81:b2:c5:d5",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:1a:66",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.89",
-      "mac": "00:E0:81:4F:E3:81",
+      "mac": "00:e0:81:4f:e3:81",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-89-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-89-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/42",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530094,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index ddb60d20a7a02d17004ad78091a25647bd0d4f90..1301132015e3f9be5932b0aee5136b4235f2dc79 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530014
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.9",
-      "mac": "00:E0:81:B2:C5:76",
+      "ip6": "fe80::2e0:81ff:feb2:c576",
+      "mac": "00:e0:81:b2:c5:76",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C5:77",
+      "mac": "00:e0:81:b2:c5:77",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:02:80:5e",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.9",
-      "mac": "00:E0:81:4F:E2:FE",
+      "mac": "00:e0:81:4f:e2:fe",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-9-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-9-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon1-ipmi",
       "switch_port": "1/0/9",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530014,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
index 4c89470c4a32e5af607dfb6c21b63fee706fe2a0..06689993583340ef328e4bb05e26d7bf718f266e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530095
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.90",
-      "mac": "00:E0:81:B2:C0:46",
+      "ip6": "fe80::2e0:81ff:feb2:c046",
+      "mac": "00:e0:81:b2:c0:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:C0:47",
+      "mac": "00:e0:81:b2:c0:47",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:1a:22",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.90",
-      "mac": "00:E0:81:4F:CA:FC",
+      "mac": "00:e0:81:4f:ca:fc",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-90-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-90-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/43",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530095,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
index a4dc052f1a98f318ac6c455535d81c835dd398a2..d77bf4962811002d2af2d7a7aa08e15542b99dfb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530096
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.91",
-      "mac": "00:E0:81:B5:8F:94",
+      "ip6": "fe80::2e0:81ff:feb5:8f94",
+      "mac": "00:e0:81:b5:8f:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B5:8F:95",
+      "mac": "00:e0:81:b5:8f:95",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:00:7b:26",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.91",
-      "mac": "00:E0:81:4F:28:B8",
+      "mac": "00:e0:81:4f:28:b8",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-91-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-91-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/44",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530096,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "Hitachi HDT72103",
       "rev": "ST2O",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
index 014ae422edf5645975e47de3192c55f77c34fbe6..bf6dac045866b09aa9eb8fda16526c6df6611765 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -9,11 +9,16 @@
     "vendor": "Phoenix Technologies LTD",
     "version": "V1.05"
   },
+  "chassis": {
+    "manufacturer": "TYAN Computer Corporation",
+    "name": "S5393",
+    "serial": 812530097
+  },
   "gpu": {
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 17179869184,
+    "ram_size": 16867946496,
     "virtual_size": null
   },
   "network_adapters": [
@@ -24,7 +29,8 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.92",
-      "mac": "00:E0:81:B2:BF:DE",
+      "ip6": "fe80::2e0:81ff:feb2:bfde",
+      "mac": "00:e0:81:b2:bf:de",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -36,9 +42,14 @@
       "version": "80003ES2LAN"
     },
     {
+      "bridged": false,
+      "driver": "e1000e",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:DF",
+      "mac": "00:e0:81:b2:bf:df",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -63,22 +74,28 @@
       "version": "MT26418"
     },
     {
+      "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:03:1a:0a",
       "interface": "InfiniBand",
+      "management": false,
+      "mountable": false,
+      "mounted": false,
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
     },
     {
+      "device": "bmc",
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.92",
-      "mac": "00:E0:81:4F:E3:5D",
+      "mac": "00:e0:81:4f:e3:5d",
       "management": true,
       "mountable": false,
       "mounted": false,
-      "network_address": "griffon-92-ipmi.nancy.grid5000.fr",
+      "network_address": "griffon-92-bmc.nancy.grid5000.fr",
       "rate": 100000000,
       "switch": "sgriffon3-ipmi",
       "switch_port": "1/0/45",
@@ -87,10 +104,10 @@
     }
   ],
   "operating_system": {
-    "kernel": "2.6.32",
-    "name": "Debian",
-    "release": "6.0",
-    "version": null
+    "kernel": "#1 SMP Debian 3.2.35-2",
+    "name": "debian",
+    "release": "Squeeze",
+    "version": 7.0
   },
   "performance": {
     "core_flops": 7963000000.0,
@@ -98,13 +115,14 @@
   },
   "processor": {
     "cache_l1": null,
-    "cache_l1d": null,
-    "cache_l1i": null,
-    "cache_l2": 12582912,
-    "clock_speed": 2500000000.0,
-    "instruction_set": "",
+    "cache_l1d": 32768,
+    "cache_l1i": 32768,
+    "cache_l2": 6291456,
+    "cache_l3": 0,
+    "clock_speed": 2500000000,
+    "instruction_set": "x86-64",
     "model": "Intel Xeon",
-    "other_description": "",
+    "other_description": "Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz",
     "vendor": "Intel",
     "version": "L5420"
   },
@@ -118,7 +136,6 @@
       }
     }
   },
-  "serial": 812530097,
   "storage_devices": [
     {
       "device": "sda",
@@ -126,7 +143,8 @@
       "interface": "SATA II",
       "model": "HDP725032GLA360",
       "rev": "GM3OA5CA",
-      "size": 298023223876.953
+      "size": 320072933376,
+      "vendor": "Hitachi"
     }
   ],
   "supported_job_types": {
diff --git a/generators/input/sites/nancy/clusters/griffon.rb b/generators/input/sites/nancy/clusters/griffon.rb
index f0f7b55fe12928953019e43bd782720c34017e9a..30b64039e17265d3f573f57c558ee9906d278dc4 100644
--- a/generators/input/sites/nancy/clusters/griffon.rb
+++ b/generators/input/sites/nancy/clusters/griffon.rb
@@ -4,144 +4,167 @@ site :nancy do |site_uid|
     model "Carri System CS-5393B"
     created_at Time.parse("2009-04-10").httpdate
     kavlan true
+
     92.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
-        serial lookup('griffon', node_uid, 'chassis', 'serial_number')
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+
         performance({
-          :core_flops => 7.963.G,
-          :node_flops => 52.5.G
+        :core_flops => 7.963.G,
+        :node_flops => 52.5.G
+      })
+
+        supported_job_types({
+          :deploy       => true,
+          :besteffort   => true,
+          :virtual      => lookup('griffon', node_uid, 'supported_job_types', 'virtual')
         })
+
         architecture({
-          :smp_size => 2,
-          :smt_size => 8,
-          :platform_type => "x86_64"
-          })
+          :smp_size       => lookup('griffon', node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup('griffon', node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup('griffon', node_uid, 'architecture', 'platform_type')
+        })
+
         processor({
-          :vendor => "Intel",
-          :model => "Intel Xeon",
-          :version => "L5420",
-          :clock_speed => 2.5.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 12.MiB
+          :vendor             => lookup('griffon', node_uid, 'processor', 'vendor'),
+          :model              => lookup('griffon', node_uid, 'processor', 'model'),
+          :version            => lookup('griffon', node_uid, 'processor', 'version'),
+          :clock_speed        => lookup('griffon', node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup('griffon', node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup('griffon', node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup('griffon', node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup('griffon', node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup('griffon', node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup('griffon', node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup('griffon', node_uid, 'processor', 'cache_l3')
         })
+
         main_memory({
-          :ram_size => 16.GiB,
+          :ram_size     => lookup('griffon', node_uid, 'main_memory', 'ram_size'),
           :virtual_size => nil
         })
+
         operating_system({
-          :name => "Debian",
-          :release => "6.0",
-          :version => nil,
-	  :kernel => "2.6.32"
+          :name     => lookup('griffon', node_uid, 'operating_system', 'name'),
+          :release  => "Squeeze",
+          :version  => lookup('griffon', node_uid, 'operating_system', 'version'),
+          :kernel   => lookup('griffon', node_uid, 'operating_system', 'kernel')
         })
         storage_devices [{
-          :interface => 'SATA II',
-          :size => 320.GB,
-          :driver => "ahci",
-	  :device => "sda",
-	  :model => lookup('griffon', node_uid, 'block_devices', 'sda', 'model'),
-	  :rev => lookup('griffon', node_uid, 'block_devices', 'sda', 'rev')
+          :interface  => 'SATA II',
+          :size       => lookup('griffon', node_uid, 'block_devices', 'sda', 'size'),
+          :driver     => "ahci",
+          :device     => lookup('griffon', node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup('griffon', node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup('griffon', node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup('griffon', node_uid, 'block_devices', 'sda', 'rev')
         }]
+
         network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :device => "eth0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :bridged => true,
-          :management => false,
-          :switch => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
-          :mac => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mac'),
-          :ip => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :driver => "e1000e",
-	  :vendor => "intel",
-	  :version => "80003ES2LAN"
+          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'interface'),
+          :rate             => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'rate'),
+          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'enabled'),
+          :management       => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'management'),
+          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mountable'),
+          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mounted'),
+          :bridged          => true,
+          :device           => "eth0",
+          :vendor           => "intel",
+          :version          => "80003ES2LAN",
+          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'driver'),
+          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+          :ip               => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :ip6              => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'ip6'),
+          :switch           => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
+          :switch_port      => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :mac              => lookup('griffon', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mac'),
-          #:mountable => false,
-          #:management => false,
-          #:driver => "e1000e",
-	  :vendor => "intel",
-	  :version => "BCM5721"
+          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'interface'),
+          :rate             => 1.G,
+          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'enabled'),
+          :management       => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'management'),
+          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mountable'),
+          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mounted'),
+          :bridged          => false,
+          :vendor           => "intel",
+          :version          => "BCM5721",
+          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'driver'),
+          :mac              => lookup('griffon', node_uid, 'network_interfaces', 'eth1', 'mac')
         },
-	{
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :device => "ib0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'ip'),
-          :guid => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'guid'),
-          :hwid => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'hwid'),
-	  :switch => "sgriffonib",
-          :ib_switch_card => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'line_card'),
+        {
+          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'interface'),
+          :rate             => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'rate'),
+          :device           => "ib0",
+          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'enabled'),
+          :management       => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'management'),
+          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'mountable'),
+          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'mounted'),
+          :vendor           => 'Mellanox',
+          :version          => "MT26418",
+          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'driver'),
+          :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip               => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'ip'),
+          :guid             => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'guid'),
+          :switch           => "sgriffonib",
+          :ib_switch_card   => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'line_card'),
           :ib_switch_card_pos => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'position'),
-          :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418"
+          :hwid             => lookup('griffon', node_uid, 'network_interfaces', 'ib0', 'hwid')
         },
         {
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :enabled => false,
-          #:mountable => false,
-          #:mounted => false,
-          #:management => false,
-          :vendor => "Mellanox",
-	  :version => "MT26418",
-          :guid => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'guid'),
+          :interface        => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'interface'),
+          :rate             => 20.G,
+          :device           => "ib1",
+          :enabled          => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'enabled'),
+          :management       => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'management'),
+          :mountable        => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'mountable'),
+          :mounted          => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'mounted'),
+          :vendor           => 'Mellanox',
+          :version          => "MT26418",
+          :driver           => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'driver'),
+          :guid             => lookup('griffon', node_uid, 'network_interfaces', 'ib1', 'guid')
         },
         {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "Tyan", :version => "M3296",
-          :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :ip => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'ip'),
-          :mac => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'mac'),
-          :switch => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
-          :switch_port => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_port')
+          :interface            => 'Ethernet',
+          :rate                 => 100.M,
+          :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :ip                   => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'ip'),
+          :mac                  => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'mac'),
+          :switch               => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+          :switch_port          => lookup('griffon', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
+          :enabled              => true,
+          :mounted              => false,
+          :mountable            => false,
+          :management           => true,
+          :device               => "bmc",
+          :vendor               => "Tyan",
+          :version              => "M3296"
         }]
-	# pdu({
-	#   :vendor => "American Power Conversion",
-  #        :pdu => lookup('griffon', node_uid, 'pdu', 'pdu_name'),
-  #        :pdu_port => lookup('griffon', node_uid, 'pdu', 'pdu_position'),
-	# })
 
-  bios({
-	  :version	=> lookup('griffon', node_uid, 'bios', 'version'),
-	  :vendor	=> lookup('griffon', node_uid, 'bios', 'vendor'),
-	  :release_date	=> lookup('griffon', node_uid, 'bios', 'release_date'),
-	})
-    gpu({
-       :gpu  => false
+        chassis({
+          :serial       => lookup('griffon', node_uid, 'chassis', 'serial_number'),
+          :name         => lookup('griffon', node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup('griffon', node_uid, 'chassis', 'manufacturer')
+        })
+
+        bios({
+          :version      => lookup('griffon', node_uid, 'bios', 'version'),
+          :vendor       => lookup('griffon', node_uid, 'bios', 'vendor'),
+          :release_date => lookup('griffon', node_uid, 'bios', 'release_date')
         })
 
-    sensors({
-      :power => {
-        :available => false, # Set to true when pdu resources will be declared
-        :via => {
-          :pdu => { :uid => lookup('griffon', node_uid, 'pdu', 'pdu_name') }
-        }
-      }
-    })
+        gpu({
+          :gpu  => false
+        })
+
+        sensors({
+          :power => {
+            :available => false, # Set to true when pdu resources will be declared
+            :via => {
+              :pdu => { :uid => lookup('griffon', node_uid, 'pdu', 'pdu_name') }
+            }
+          }
+        })
       end
     end
   end # cluster griffon
diff --git a/generators/input/sites/nancy/clusters/griffon.yaml b/generators/input/sites/nancy/clusters/griffon.yaml
index 206f408b159802485d6c4172c0d8711064d9410f..df1803fc09ca8b1fa2e56379a9d163e9f5f1e192 100644
--- a/generators/input/sites/nancy/clusters/griffon.yaml
+++ b/generators/input/sites/nancy/clusters/griffon.yaml
@@ -1,14 +1,91 @@
+---
 griffon-1:
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.1
+      mac: 00:e0:81:4f:e3:13
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/1
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.1
+      ip6: fe80::2e0:81ff:feb2:c188
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:88
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/1
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:89
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.1
+      ip6: fe80::202:c903:3:18f1
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318F0'
+      line_card: '0x000b8cffff003106'
+      position: 1
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f2
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
     serial_number: 812530006
     manufacturer: TYAN Computer Corporation
@@ -16,77 +93,187 @@ griffon-1:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 4
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1
-      ip: 172.18.65.1
-      hwid: "0xC903000318F0"
-      line_card: "0x000b8cffff003106"
-      position: 1
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f2
-    eth0:
-      mac: 00:E0:81:B2:C1:88
-      ip: 172.16.65.1
-      switch_name: sgriffon1
-      switch_port: Gi1/0/1
-    eth1:
-      mac: 00:E0:81:B2:C1:89
-    bmc:
-      mac: 00:E0:81:4F:E3:13
-      ip: 172.17.65.1
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/1
 griffon-2:
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530007
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 3
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65
-      ip: 172.18.65.2
-      hwid: "0xC90300028064"
-      line_card: "0x000b8cffff003106"
-      position: 2
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:66
     eth0:
-      mac: 00:E0:81:B2:C4:BC
+      interface: Ethernet
       ip: 172.16.65.2
+      ip6: fe80::2e0:81ff:feb2:c4bc
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:bc
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
       switch_port: Gi1/0/2
     eth1:
-      mac: 00:E0:81:B2:C4:BD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:bd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.2
+      ip6: fe80::202:c903:2:8065
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300028064'
+      line_card: '0x000b8cffff003106'
+      position: 2
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:66
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:FC
       ip: 172.17.65.2
+      mac: 00:e0:81:4f:e2:fc
       switch_name: sgriffon1-ipmi
       switch_port: 1/0/2
+  chassis:
+    serial_number: 812530007
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 3
 griffon-3:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.3
+      mac: 00:e0:81:4f:cb:0a
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/3
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.3
+      ip6: fe80::2e0:81ff:feb2:c1fe
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:fe
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/3
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:ff
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.3
+      ip6: fe80::202:c903:2:7f61
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300027F60'
+      line_card: '0x000b8cffff003106'
+      position: 3
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   chassis:
     serial_number: 812530008
     manufacturer: TYAN Computer Corporation
@@ -94,38 +281,93 @@ griffon-3:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 2
+griffon-4:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61
-      ip: 172.18.65.3
-      hwid: "0xC90300027F60"
-      line_card: "0x000b8cffff003106"
-      position: 3
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62
+    bmc:
+      ip: 172.17.65.4
+      mac: 00:e0:81:4f:e3:7a
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/4
     eth0:
-      mac: 00:E0:81:B2:C1:FE
-      ip: 172.16.65.3
+      interface: Ethernet
+      ip: 172.16.65.4
+      ip6: fe80::2e0:81ff:feb2:bfe4
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:e4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/3
+      switch_port: Gi1/0/4
     eth1:
-      mac: 00:E0:81:B2:C1:FF
-    bmc:
-      mac: 00:E0:81:4F:CB:0A
-      ip: 172.17.65.3
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/3
-griffon-4:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:e5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.4
+      ip6: fe80::202:c903:2:8069
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300028068'
+      line_card: '0x000b8cffff003106'
+      position: 4
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:6a
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
     serial_number: 812530009
     manufacturer: TYAN Computer Corporation
@@ -133,36 +375,91 @@ griffon-4:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 1
+griffon-5:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69
-      ip: 172.18.65.4
-      hwid: "0xC90300028068"
-      line_card: "0x000b8cffff003106"
-      position: 4
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:6a
+    bmc:
+      ip: 172.17.65.5
+      mac: 00:e0:81:4f:e3:8d
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/5
     eth0:
-      mac: 00:E0:81:B2:BF:E4
-      ip: 172.16.65.4
+      interface: Ethernet
+      ip: 172.16.65.5
+      ip6: fe80::2e0:81ff:feb2:c1fc
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:fc
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/4
+      switch_port: Gi1/0/5
     eth1:
-      mac: 00:E0:81:B2:BF:E5
-    bmc:
-      mac: 00:E0:81:4F:E3:7A
-      ip: 172.17.65.4
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/4
-griffon-5:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:fd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.5
+      ip6: fe80::202:c903:2:80c1
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280C0'
+      line_card: '0x000b8cffff003106'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c2
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -172,38 +469,93 @@ griffon-5:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 3
+griffon-6:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1
-      ip: 172.18.65.5
-      hwid: "0xC903000280C0"
-      line_card: "0x000b8cffff003106"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c2
+    bmc:
+      ip: 172.17.65.6
+      mac: 00:e0:81:4f:e3:74
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/6
     eth0:
-      mac: 00:E0:81:B2:C1:FC
-      ip: 172.16.65.5
+      interface: Ethernet
+      ip: 172.16.65.6
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:7e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/5
+      switch_port: Gi1/O/6
     eth1:
-      mac: 00:E0:81:B2:C1:FD
-    bmc:
-      mac: 00:E0:81:4F:E3:8D
-      ip: 172.17.65.5
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/5
-griffon-6:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:e8
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.6
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280AC'
+      line_card: '0x000b8cffff003106'
+      position: 6
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ae
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530011
     manufacturer: TYAN Computer Corporation
@@ -211,38 +563,93 @@ griffon-6:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 4
+griffon-7:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad
-      ip: 172.18.65.6
-      hwid: "0xC903000280AC"
-      line_card: "0x000b8cffff003106"
-      position: 6
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ae
+    bmc:
+      ip: 172.17.65.7
+      mac: 00:e0:81:4f:ca:90
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/7
     eth0:
-      mac: 00:E0:81:B1:C4:7E
-      ip: 172.16.65.6
+      interface: Ethernet
+      ip: 172.16.65.7
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:ac
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/O/6
+      switch_port: Gi1/0/7
     eth1:
-      mac: 00:E0:81:B1:C4:E8
-    bmc:
-      mac: 00:E0:81:4F:E3:74
-      ip: 172.17.65.6
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/6
-griffon-7:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:ad
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.7
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300028054'
+      line_card: '0x000b8cffff003106'
+      position: 7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:56
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530012
     manufacturer: TYAN Computer Corporation
@@ -250,38 +657,93 @@ griffon-7:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 5
+griffon-8:
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55
-      ip: 172.18.65.7
-      hwid: "0xC90300028054"
-      line_card: "0x000b8cffff003106"
-      position: 7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:56
+    bmc:
+      ip: 172.17.65.8
+      mac: 00:e0:81:4f:e3:c2
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/8
     eth0:
-      mac: 00:E0:81:B2:C4:AC
-      ip: 172.16.65.7
+      interface: Ethernet
+      ip: 172.16.65.8
+      ip6: fe80::2e0:81ff:feb2:c4a0
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:a0
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/7
+      switch_port: Gi1/0/8
     eth1:
-      mac: 00:E0:81:B2:C4:AD
-    bmc:
-      mac: 00:E0:81:4F:CA:90
-      ip: 172.17.65.7
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/7
-griffon-8:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:a1
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.8
+      ip6: fe80::202:c903:2:80c9
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280C8'
+      line_card: '0x000b8cffff003106'
+      position: 8
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ca
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   chassis:
     serial_number: 812530013
     manufacturer: TYAN Computer Corporation
@@ -289,38 +751,93 @@ griffon-8:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 6
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9
-      ip: 172.18.65.8
-      hwid: "0xC903000280C8"
-      line_card: "0x000b8cffff003106"
-      position: 8
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ca
-    eth0:
-      mac: 00:E0:81:B2:C4:A0
-      ip: 172.16.65.8
-      switch_name: sgriffon1
-      switch_port: Gi1/0/8
-    eth1:
-      mac: 00:E0:81:B2:C4:A1
-    bmc:
-      mac: 00:E0:81:4F:E3:C2
-      ip: 172.17.65.8
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/8
 griffon-9:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.9
+      mac: 00:e0:81:4f:e2:fe
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/9
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.9
+      ip6: fe80::2e0:81ff:feb2:c576
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:76
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/10
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:77
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.9
+      ip6: fe80::202:c903:2:805d
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030002805C'
+      line_card: '0x000b8cffff003106'
+      position: 9
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5e
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
     serial_number: 812530014
     manufacturer: TYAN Computer Corporation
@@ -328,38 +845,93 @@ griffon-9:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 10
+griffon-10:
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d
-      ip: 172.18.65.9
-      hwid: "0xC9030002805C"
-      line_card: "0x000b8cffff003106"
-      position: 9
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5e
     eth0:
-      mac: 00:E0:81:B2:C5:76
-      ip: 172.16.65.9
+      interface: Ethernet
+      ip: 172.16.65.10
+      ip6: fe80::2e0:81ff:feb2:c0a4
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:a4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/10
+      switch_port: Gi1/O/9
     eth1:
-      mac: 00:E0:81:B2:C5:77
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:a5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.10
+      ip6: fe80::202:c903:2:7f59
+      driver: mlx4_core
+      guid:
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300027F58'
+      line_card: '0x000b8cffff003106'
+      position: 10
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid:
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:FE
-      ip: 172.17.65.9
+      ip: 172.17.65.10
+      mac: 00:e0:81:4f:ca:9e
       switch_name: sgriffon1-ipmi
-      switch_port: 1/0/9
-griffon-10:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      switch_port: 1/0/10
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
     serial_number: 812530015
     manufacturer: TYAN Computer Corporation
@@ -367,38 +939,93 @@ griffon-10:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 11
-  network_interfaces:
-    ib0:
-      guid:
-      ip: 172.18.65.10
-      hwid: "0xC90300027F58"
-      line_card: "0x000b8cffff003106"
-      position: 10
-    ib1:
-      guid:
-    eth0:
-      mac: 00:E0:81:B2:C0:A4
-      ip: 172.16.65.10
-      switch_name: sgriffon1
-      switch_port: Gi1/O/9
-    eth1:
-      mac: 00:E0:81:B2:C0:A5
-    bmc:
-      mac: 00:E0:81:4F:CA:9E
-      ip: 172.17.65.10
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/10
 griffon-11:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.11
+      mac: 00:e0:81:4f:e3:70
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/25
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.11
+      ip6: fe80::2e0:81ff:feb2:c24c
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:4c
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/25
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:4d
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.11
+      ip6: fe80::202:c903:2:80d9
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300028008'
+      line_card: '0x000b8cffff003106'
+      position: 11
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:da
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
     serial_number: 812530016
     manufacturer: TYAN Computer Corporation
@@ -406,38 +1033,93 @@ griffon-11:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 12
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9
-      ip: 172.18.65.11
-      hwid: "0xC90300028008"
-      line_card: "0x000b8cffff003106"
-      position: 11
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:da
-    eth0:
-      mac: 00:E0:81:B2:C2:4C
-      ip: 172.16.65.11
-      switch_name: sgriffon1
-      switch_port: Gi1/0/25
-    eth1:
-      mac: 00:E0:81:B2:C2:4D
-    bmc:
-      mac: 00:E0:81:4F:E3:70
-      ip: 172.17.65.11
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/25
 griffon-12:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.12
+      mac: 00:e0:81:4f:ca:8b
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/26
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.12
+      ip6: fe80::2e0:81ff:feb2:c19e
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:9e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/26
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:9f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.12
+      ip6: fe80::202:c903:2:80dd
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280DC'
+      line_card: '0x000b8cffff003106'
+      position: 12
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:de
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   chassis:
     serial_number: 812530017
     manufacturer: TYAN Computer Corporation
@@ -445,38 +1127,93 @@ griffon-12:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 13
+griffon-13:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd
-      ip: 172.18.65.12
-      hwid: "0xC903000280DC"
-      line_card: "0x000b8cffff003106"
-      position: 12
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:de
+    bmc:
+      ip: 172.17.65.13
+      mac: 00:e0:81:4f:e2:d4
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/27
     eth0:
-      mac: 00:E0:81:B2:C1:9E
-      ip: 172.16.65.12
+      interface: Ethernet
+      ip: 172.16.65.13
+      ip6: fe80::2e0:81ff:feb2:c1e4
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:e4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/26
+      switch_port: Gi1/0/27
     eth1:
-      mac: 00:E0:81:B2:C1:9F
-    bmc:
-      mac: 00:E0:81:4F:CA:8B
-      ip: 172.17.65.12
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/26
-griffon-13:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:e5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.13
+      ip6: fe80::202:c903:2:80bd
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:bd
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280BC'
+      line_card: '0x000b8cffff003054'
+      position: 1
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:be
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
     serial_number: 812530018
     manufacturer: TYAN Computer Corporation
@@ -484,38 +1221,93 @@ griffon-13:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 14
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:bd
-      ip: 172.18.65.13
-      hwid: "0xC903000280BC"
-      line_card: "0x000b8cffff003054"
-      position: 1
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:be
-    eth0:
-      mac: 00:E0:81:B2:C1:E4
-      ip: 172.16.65.13
-      switch_name: sgriffon1
-      switch_port: Gi1/0/27
-    eth1:
-      mac: 00:E0:81:B2:C1:E5
-    bmc:
-      mac: 00:E0:81:4F:E2:D4
-      ip: 172.17.65.13
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/27
 griffon-14:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.14
+      mac: 00:e0:81:4f:e2:c5
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/28
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.14
+      ip6: fe80::2e0:81ff:feb1:c060
+      driver: e1000e
+      mac: 00:e0:81:b1:c0:60
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/28
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b1:c0:61
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.14
+      ip6: fe80::202:c903:2:80cd
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280CC'
+      line_card: '0x000b8cffff003054'
+      position: 2
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ce
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
   chassis:
     serial_number: 812530019
     manufacturer: TYAN Computer Corporation
@@ -523,77 +1315,187 @@ griffon-14:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 15
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd
-      ip: 172.18.65.14
-      hwid: "0xC903000280CC"
-      line_card: "0x000b8cffff003054"
-      position: 2
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ce
-    eth0:
-      mac: 00:E0:81:B1:C0:60
-      ip: 172.16.65.14
-      switch_name: sgriffon1
-      switch_port: Gi1/0/28
-    eth1:
-      mac: 00:E0:81:B1:C0:61
-    bmc:
-      mac: 00:E0:81:4F:E2:C5
-      ip: 172.17.65.14
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/28
 griffon-15:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530020
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 17
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5
-      ip: 172.18.65.15
-      hwid: "0xC903000280B4"
-      line_card: "0x000b8cffff003054"
-      position: 3
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b6
     eth0:
-      mac: 00:E0:81:B2:C4:C4
+      interface: Ethernet
       ip: 172.16.65.15
+      ip6: fe80::2e0:81ff:feb2:c4c4
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:c4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
       switch_port: Gi1/0/29
     eth1:
-      mac: 00:E0:81:B2:C4:C5
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:c5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.15
+      ip6: fe80::202:c903:2:80b5
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280B4'
+      line_card: '0x000b8cffff003054'
+      position: 3
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b6
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:87
       ip: 172.17.65.15
+      mac: 00:e0:81:4f:e3:87
       switch_name: sgriffon1-ipmi
       switch_port: 1/0/29
-griffon-16:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  chassis:
+    serial_number: 812530020
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 17
+griffon-16:
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.16
+      mac: 00:e0:81:4f:e2:d8
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/30
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.16
+      ip6: fe80::2e0:81ff:feb2:bfa0
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:a0
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/30
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:a1
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.16
+      ip6: fe80::202:c903:3:303f
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3f
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003303E'
+      line_card: '0x000b8cffff003054'
+      position: 4
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:40
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   chassis:
     serial_number: 812530021
     manufacturer: TYAN Computer Corporation
@@ -601,36 +1503,91 @@ griffon-16:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 18
+griffon-17:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3f
-      ip: 172.18.65.16
-      hwid: "0xC9030003303E"
-      line_card: "0x000b8cffff003054"
-      position: 4
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:40
+    bmc:
+      ip: 172.17.65.17
+      mac: 00:e0:81:4f:e3:6a
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/31
     eth0:
-      mac: 00:E0:81:B2:BF:A0
-      ip: 172.16.65.16
+      interface: Ethernet
+      ip: 172.16.65.17
+      ip6: fe80::2e0:81ff:feb2:c218
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:18
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/30
+      switch_port: Gi1/0/31
     eth1:
-      mac: 00:E0:81:B2:BF:A1
-    bmc:
-      mac: 00:E0:81:4F:E2:D8
-      ip: 172.17.65.16
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/30
-griffon-17:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:19
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.17
+      ip6: fe80::202:c903:3:3017
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033016'
+      line_card: '0x000b8cffff003054'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:18
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -640,36 +1597,91 @@ griffon-17:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 19
+griffon-18:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17
-      ip: 172.18.65.17
-      hwid: "0xC90300033016"
-      line_card: "0x000b8cffff003054"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:18
     eth0:
-      mac: 00:E0:81:B2:C2:18
-      ip: 172.16.65.17
+      interface: Ethernet
+      ip: 172.16.65.18
+      ip6: fe80::2e0:81ff:feb2:c204
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:04
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/31
+      switch_port: Gi1/0/32
     eth1:
-      mac: 00:E0:81:B2:C2:19
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:05
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.18
+      ip6: fe80::202:c903:3:302b
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003302A'
+      line_card: '0x000b8cffff003054'
+      position: 6
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2c
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:6A
-      ip: 172.17.65.17
+      ip: 172.17.65.18
+      mac: 00:e0:81:4f:cb:0e
       switch_name: sgriffon1-ipmi
-      switch_port: 1/0/31
-griffon-18:
+      switch_port: 1/0/32
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -679,38 +1691,93 @@ griffon-18:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 20
+griffon-19:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b
-      ip: 172.18.65.18
-      hwid: "0xC9030003302A"
-      line_card: "0x000b8cffff003054"
-      position: 6
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2c
+    bmc:
+      ip: 172.17.65.19
+      mac: 00:e0:81:4f:e3:00
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/33
     eth0:
-      mac: 00:E0:81:B2:C2:04
-      ip: 172.16.65.18
+      interface: Ethernet
+      ip: 172.16.65.19
+      ip6: fe80::2e0:81ff:feb2:c560
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:60
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/32
+      switch_port: Gi1/0/33
     eth1:
-      mac: 00:E0:81:B2:C2:05
-    bmc:
-      mac: 00:E0:81:4F:CB:0E
-      ip: 172.17.65.18
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/32
-griffon-19:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:61
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.19
+      ip6: fe80::202:c903:3:3037
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033036'
+      line_card: '0x000b8cffff003054'
+      position: 7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:38
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: 812530024
     manufacturer: TYAN Computer Corporation
@@ -718,38 +1785,93 @@ griffon-19:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 21
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37
-      ip: 172.18.65.19
-      hwid: "0xC90300033036"
-      line_card: "0x000b8cffff003054"
-      position: 7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:38
-    eth0:
-      mac: 00:E0:81:B2:C5:60
-      ip: 172.16.65.19
-      switch_name: sgriffon1
-      switch_port: Gi1/0/33
-    eth1:
-      mac: 00:E0:81:B2:C5:61
-    bmc:
-      mac: 00:E0:81:4F:E3:00
-      ip: 172.17.65.19
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/33
 griffon-20:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.20
+      mac: 00:e0:81:4f:ca:8e
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/34
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.20
+      ip6: fe80::2e0:81ff:feb2:c574
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:74
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/34
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:75
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.20
+      ip6: fe80::202:c903:3:2fcb
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cb
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300032FCA'
+      line_card: '0x000b8cffff003101'
+      position: 2
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cc
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
     serial_number: 812530025
     manufacturer: TYAN Computer Corporation
@@ -757,38 +1879,93 @@ griffon-20:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 22
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cb
-      ip: 172.18.65.20
-      hwid: "0xC90300032FCA"
-      line_card: "0x000b8cffff003101"
-      position: 2
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cc
-    eth0:
-      mac: 00:E0:81:B2:C5:74
-      ip: 172.16.65.20
-      switch_name: sgriffon1
-      switch_port: Gi1/0/34
-    eth1:
-      mac: 00:E0:81:B2:C5:75
-    bmc:
-      mac: 00:E0:81:4F:CA:8E
-      ip: 172.17.65.20
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/34
 griffon-21:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.21
+      mac: 00:e0:81:4f:e2:fb
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/35
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.21
+      ip6: fe80::2e0:81ff:feb2:bfc2
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:c2
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/35
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:cd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.21
+      ip6: fe80::202:c903:3:304f
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003304E'
+      line_card: '0x000b8cffff003101'
+      position: 1
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:50
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530026
     manufacturer: TYAN Computer Corporation
@@ -796,38 +1973,93 @@ griffon-21:
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
     pdu_position: 23
+griffon-22:
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f
-      ip: 172.18.65.21
-      hwid: "0xC9030003304E"
-      line_card: "0x000b8cffff003101"
-      position: 1
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:50
+    bmc:
+      ip: 172.17.65.22
+      mac: 00:e0:81:4f:cb:02
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/36
     eth0:
-      mac: 00:E0:81:B2:BF:C2
-      ip: 172.16.65.21
+      interface: Ethernet
+      ip: 172.16.65.22
+      ip6: fe80::2e0:81ff:feb2:bfa6
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:a6
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/35
+      switch_port: Gi1/0/36
     eth1:
-      mac: 00:E0:81:B2:BF:CD
-    bmc:
-      mac: 00:E0:81:4F:E2:FB
-      ip: 172.17.65.21
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/35
-griffon-22:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:a7
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.22
+      ip6: fe80::202:c903:3:3033
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033032'
+      line_card: '0x000b8cffff003101'
+      position: 3
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:34
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
     serial_number: 812530027
     manufacturer: TYAN Computer Corporation
@@ -835,38 +2067,93 @@ griffon-22:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 21
+griffon-23:
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33
-      ip: 172.18.65.22
-      hwid: "0xC90300033032"
-      line_card: "0x000b8cffff003101"
-      position: 3
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:34
+    bmc:
+      ip: 172.17.65.23
+      mac: 00:e0:81:4f:ca:7e
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/O/37
     eth0:
-      mac: 00:E0:81:B2:BF:A6
-      ip: 172.16.65.22
+      interface: Ethernet
+      ip: 172.16.65.23
+      ip6: fe80::2e0:81ff:feb2:c156
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:56
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/36
+      switch_port: Gi1/0/37
     eth1:
-      mac: 00:E0:81:B2:BF:A7
-    bmc:
-      mac: 00:E0:81:4F:CB:02
-      ip: 172.17.65.22
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/36
-griffon-23:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:57
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.23
+      ip6: fe80::202:c903:3:302f
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003302F'
+      line_card: '0x000b8cffff003101'
+      position: 4
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:30
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530028
     manufacturer: TYAN Computer Corporation
@@ -874,38 +2161,93 @@ griffon-23:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 20
+griffon-24:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f
-      ip: 172.18.65.23
-      hwid: "0xC9030003302F"
-      line_card: "0x000b8cffff003101"
-      position: 4
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:30
+    bmc:
+      ip: 172.17.65.24
+      mac: 00:e0:81:4f:ca:7f
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/38
     eth0:
-      mac: 00:E0:81:B2:C1:56
-      ip: 172.16.65.23
+      interface: Ethernet
+      ip: 172.16.65.24
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:2e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/37
+      switch_port: Gi1/0/38
     eth1:
-      mac: 00:E0:81:B2:C1:57
-    bmc:
-      mac: 00:E0:81:4F:CA:7E
-      ip: 172.17.65.23
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/O/37
-griffon-24:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:2f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.24
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d7
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300032FD6'
+      line_card: '0x000b8cffff003101'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d8
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530029
     manufacturer: TYAN Computer Corporation
@@ -913,36 +2255,91 @@ griffon-24:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 19
+griffon-25:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d7
-      ip: 172.18.65.24
-      hwid: "0xC90300032FD6"
-      line_card: "0x000b8cffff003101"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d8
+    bmc:
+      ip: 172.17.65.25
+      mac: 00:e0:81:4f:e3:ba
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/39
     eth0:
-      mac: 00:E0:81:B2:C2:2E
-      ip: 172.16.65.24
+      interface: Ethernet
+      ip: 172.16.65.25
+      ip6: fe80::2e0:81ff:feb2:bfe2
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:e2
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/38
+      switch_port: Gi1/0/39
     eth1:
-      mac: 00:E0:81:B2:C2:2F
-    bmc:
-      mac: 00:E0:81:4F:CA:7F
-      ip: 172.17.65.24
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/38
-griffon-25:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:e3
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.25
+      ip6: fe80::202:c903:3:3023
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033022'
+      line_card: '0x000b8cffff003101'
+      position: 6
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:24
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -952,38 +2349,93 @@ griffon-25:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 18
+griffon-26:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23
-      ip: 172.18.65.25
-      hwid: "0xC90300033022"
-      line_card: "0x000b8cffff003101"
-      position: 6
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:24
+    bmc:
+      ip: 172.17.65.26
+      mac: 00:e0:81:4f:b5:da
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/40
     eth0:
-      mac: 00:E0:81:B2:BF:E2
-      ip: 172.16.65.25
+      interface: Ethernet
+      ip: 172.16.65.26
+      ip6: fe80::2e0:81ff:feb2:c1c8
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:c8
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/39
+      switch_port: Gi1/0/40
     eth1:
-      mac: 00:E0:81:B2:BF:E3
-    bmc:
-      mac: 00:E0:81:4F:E3:BA
-      ip: 172.17.65.25
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/39
-griffon-26:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:c9
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.26
+      ip6: fe80::202:c903:3:2fd3
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d3
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300032FD2'
+      line_card: '0x000b8cffff003101'
+      position: 7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d4
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867958784
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
     serial_number: 812530031
     manufacturer: TYAN Computer Corporation
@@ -991,38 +2443,93 @@ griffon-26:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 17
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d3
-      ip: 172.18.65.26
-      hwid: "0xC90300032FD2"
-      line_card: "0x000b8cffff003101"
-      position: 7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d4
-    eth0:
-      mac: 00:E0:81:B2:C1:C8
-      ip: 172.16.65.26
-      switch_name: sgriffon1
-      switch_port: Gi1/0/40
-    eth1:
-      mac: 00:E0:81:B2:C1:C9
-    bmc:
-      mac: 00:E0:81:4F:B5:DA
-      ip: 172.17.65.26
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/40
 griffon-27:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.27
+      mac: 00:e0:81:4f:e2:cb
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/41
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.27
+      ip6: fe80::2e0:81ff:feb2:c0c4
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:c4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/41
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:c5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.27
+      ip6: fe80::202:c903:3:301f
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1f
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003301E'
+      line_card: '0x000b8cffff003101'
+      position: 8
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:20
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
   chassis:
     serial_number: 812530032
     manufacturer: TYAN Computer Corporation
@@ -1030,38 +2537,93 @@ griffon-27:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 15
+griffon-28:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1f
-      ip: 172.18.65.27
-      hwid: "0xC9030003301E"
-      line_card: "0x000b8cffff003101"
-      position: 8
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:20
+    bmc:
+      ip: 172.17.65.28
+      mac: 00:e0:81:4f:ca:8d
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/42
     eth0:
-      mac: 00:E0:81:B2:C0:C4
-      ip: 172.16.65.27
+      interface: Ethernet
+      ip: 172.16.65.28
+      ip6: fe80::2e0:81ff:feb2:c05e
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:5e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
-      switch_port: Gi1/0/41
+      switch_port: Gi1/0/42
     eth1:
-      mac: 00:E0:81:B2:C0:C5
-    bmc:
-      mac: 00:E0:81:4F:E2:CB
-      ip: 172.17.65.27
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/41
-griffon-28:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:e6
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.28
+      ip6: fe80::202:c903:3:2fdb
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:db
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300032FDA'
+      line_card: '0x000b8cffff003101'
+      position: 9
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:dc
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
     serial_number: 812530033
     manufacturer: TYAN Computer Corporation
@@ -1069,233 +2631,563 @@ griffon-28:
   pdu:
     pdu_name: griffon-pdu2.nancy.grid5000.fr
     pdu_position: 14
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:db
-      ip: 172.18.65.28
-      hwid: "0xC90300032FDA"
-      line_card: "0x000b8cffff003101"
-      position: 9
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:dc
-    eth0:
-      mac: 00:E0:81:B2:C0:5E
-      ip: 172.16.65.28
-      switch_name: sgriffon1
-      switch_port: Gi1/0/42
-    eth1:
-      mac: 00:E0:81:B2:C0:E6
-    bmc:
-      mac: 00:E0:81:4F:CA:8D
-      ip: 172.17.65.28
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/42
 griffon-29:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530034
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 13
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43
-      ip: 172.18.65.29
-      hwid: "0xC90300033042"
-      line_card: "0x000b8cffff003101"
-      position: 10
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:44
+    bmc:
+      ip: 172.17.65.29
+      mac: 00:e0:81:4f:e3:71
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/43
     eth0:
-      mac: 00:E0:81:B2:C4:B0
+      interface: Ethernet
       ip: 172.16.65.29
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:b0
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
       switch_port: Gi1/0/43
     eth1:
-      mac: 00:E0:81:B2:C4:B1
-    bmc:
-      mac: 00:E0:81:4F:E3:71
-      ip: 172.17.65.29
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/43
-griffon-30:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:b1
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.29
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033042'
+      line_card: '0x000b8cffff003101'
+      position: 10
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:44
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  chassis:
+    serial_number: 812530034
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 13
+griffon-30:
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530035
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 1
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3b
-      ip: 172.18.65.30
-      hwid: "0xC9030003303A"
-      line_card: "0x000b8cffff003055"
-      position: 1
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3c
+    bmc:
+      ip: 172.17.65.30
+      mac: 00:e0:81:4f:e3:10
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/1
     eth0:
-      mac: 00:E0:81:B2:C0:B4
+      interface: Ethernet
       ip: 172.16.65.30
+      ip6: fe80::2e0:81ff:feb2:c0b4
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:b4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/1
     eth1:
-      mac: 00:E0:81:B2:C0:B5
-    bmc:
-      mac: 00:E0:81:4F:E3:10
-      ip: 172.17.65.30
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/1
-griffon-31:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:b5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.30
+      ip6: fe80::202:c903:3:303b
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3b
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003303A'
+      line_card: '0x000b8cffff003055'
+      position: 1
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3c
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
-    version: V1.04B
-    release_date: (12/02/2008)
     vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+    version: V1.05
+    release_date: (08/21/2009)
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
   chassis:
-    serial_number: 812530036
+    serial_number: 812530035
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 2
+    pdu_position: 1
+griffon-31:
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.04B
+    release_date: (12/02/2008)
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5f
-      ip: 172.18.65.31
-      hwid: "0xC9030003305E"
-      line_card: "0x000b8cffff003055"
-      position: 2
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:60
     eth0:
-      mac: 00:E0:81:B2:C2:24
+      interface: Ethernet
       ip: 172.16.65.31
+      ip6: fe80::2e0:81ff:feb2:c224
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:24
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/2
     eth1:
-      mac: 00:E0:81:B2:C2:25
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:25
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.31
+      ip6: fe80::202:c903:3:305f
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5f
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003305E'
+      line_card: '0x000b8cffff003055'
+      position: 2
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:60
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CB:03
       ip: 172.17.65.31
+      mac: 00:e0:81:4f:cb:03
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/2
-griffon-32:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16867946496
   chassis:
-    serial_number: 812530037
+    serial_number: 812530036
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 3
+    pdu_position: 2
+griffon-32:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5b
-      ip: 172.18.65.32
-      hwid: "0xC9030003305A"
-      line_card: "0x000b8cffff003055"
-      position: 3
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5c
+    bmc:
+      ip: 172.17.65.32
+      mac: 00:e0:81:4f:e3:8b
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/3
     eth0:
-      mac: 00:E0:81:B2:C5:9E
+      interface: Ethernet
       ip: 172.16.65.32
+      ip6: fe80::2e0:81ff:feb2:c59e
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:9e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/3
     eth1:
-      mac: 00:E0:81:B2:C5:9F
-    bmc:
-      mac: 00:E0:81:4F:E3:8B
-      ip: 172.17.65.32
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/3
-griffon-33:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:9f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.32
+      ip6: fe80::202:c903:3:305b
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5b
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003305A'
+      line_card: '0x000b8cffff003055'
+      position: 3
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5c
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530038
+    serial_number: 812530037
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 4
+    pdu_position: 3
+griffon-33:
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:57
-      ip: 172.18.65.33
-      hwid: "0xC90300033056"
-      line_card: "0x000b8cffff003055"
-      position: 4
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:58
     eth0:
-      mac: 00:E0:81:B2:BF:FA
+      interface: Ethernet
       ip: 172.16.65.33
+      ip6: fe80::2e0:81ff:feb2:bffa
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:fa
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/4
     eth1:
-      mac: 00:E0:81:B2:BF:FB
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:fb
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.33
+      ip6: fe80::202:c903:3:3057
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:57
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033056'
+      line_card: '0x000b8cffff003055'
+      position: 4
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:58
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CA:7A
       ip: 172.17.65.33
+      mac: 00:e0:81:4f:ca:7a
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/4
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  chassis:
+    serial_number: 812530038
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 4
 griffon-34:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.34
+      mac: 00:e0:81:4f:cb:20
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/5
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.34
+      ip6: fe80::2e0:81ff:feb2:54d6
+      driver: e1000e
+      mac: 00:e0:81:b2:54:d6
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/5
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:54:d7
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.34
+      ip6: fe80::202:c903:3:3053
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:53
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033052'
+      line_card: '0x000b8cffff003055'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:54
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: 812530039
     manufacturer: TYAN Computer Corporation
@@ -1303,77 +3195,187 @@ griffon-34:
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
     pdu_position: 5
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:53
-      ip: 172.18.65.34
-      hwid: "0xC90300033052"
-      line_card: "0x000b8cffff003055"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:54
-    eth0:
-      mac: 00:E0:81:B2:54:D6
-      ip: 172.16.65.34
-      switch_name: sgriffon2
-      switch_port: Gi1/0/5
-    eth1:
-      mac: 00:E0:81:B2:54:D7
-    bmc:
-      mac: 00:E0:81:4F:CB:20
-      ip: 172.17.65.34
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/5
 griffon-35:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530040
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 6
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4b
-      ip: 172.18.65.35
-      hwid: "0xC9030003304A"
-      line_card: "0x000b8cffff003055"
-      position: 6
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4c
     eth0:
-      mac: 00:E0:81:B2:C4:D4
+      interface: Ethernet
       ip: 172.16.65.35
+      ip6: fe80::2e0:81ff:feb2:c4d4
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:d4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/6
     eth1:
-      mac: 00:E0:81:B2:C4:D5
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:d5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.35
+      ip6: fe80::202:c903:3:304b
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4b
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003304A'
+      line_card: '0x000b8cffff003055'
+      position: 6
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4c
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:B5:EA
       ip: 172.17.65.35
+      mac: 00:e0:81:4f:b5:ea
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/6
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  chassis:
+    serial_number: 812530040
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 6
 griffon-36:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.36
+      mac: 00:e0:81:4f:b5:e8
+      switch_name: sgriffon2-ipmi
+      switch_port: 7
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.36
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:be
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/7
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:bf
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.36
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1b
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003301A'
+      line_card: '0x000b8cffff003055'
+      position: 1/0/7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1c
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530041
     manufacturer: TYAN Computer Corporation
@@ -1381,38 +3383,93 @@ griffon-36:
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
     pdu_position: 7
+griffon-37:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1b
-      ip: 172.18.65.36
-      hwid: "0xC9030003301A"
-      line_card: "0x000b8cffff003055"
-      position: 1/0/7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1c
+    bmc:
+      ip: 172.17.65.37
+      mac: 00:e0:81:4f:e2:d7
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/8
     eth0:
-      mac: 00:E0:81:B2:C0:BE
-      ip: 172.16.65.36
+      interface: Ethernet
+      ip: 172.16.65.37
+      ip6: fe80::2e0:81ff:feb2:c03e
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:3e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
-      switch_port: Gi1/0/7
+      switch_port: Gi1/0/8
     eth1:
-      mac: 00:E0:81:B2:C0:BF
-    bmc:
-      mac: 00:E0:81:4F:B5:E8
-      ip: 172.17.65.36
-      switch_name: sgriffon2-ipmi
-      switch_port: 7
-griffon-37:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:3f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.37
+      ip6: fe80::202:c903:2:8059
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:59
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300028058'
+      line_card: '0x000b8cffff003055'
+      position: 8
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5a
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   chassis:
     serial_number: 812530042
     manufacturer: TYAN Computer Corporation
@@ -1420,36 +3477,91 @@ griffon-37:
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
     pdu_position: 8
+griffon-38:
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:59
-      ip: 172.18.65.37
-      hwid: "0xC90300028058"
-      line_card: "0x000b8cffff003055"
-      position: 8
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5a
+    bmc:
+      ip: 172.17.65.38
+      mac: 00:e0:81:4f:e3:68
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/9
     eth0:
-      mac: 00:E0:81:B2:C0:3E
-      ip: 172.16.65.37
+      interface: Ethernet
+      ip: 172.16.65.38
+      ip6: fe80::2e0:81ff:feb2:c1d8
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:d8
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
-      switch_port: Gi1/0/8
+      switch_port: Gi1/0/9
     eth1:
-      mac: 00:E0:81:B2:C0:3F
-    bmc:
-      mac: 00:E0:81:4F:E2:D7
-      ip: 172.17.65.37
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/8
-griffon-38:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:d9
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.38
+      ip6: fe80::202:c903:3:18dd
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:dd
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318DC'
+      line_card: '0x000b8cffff003055'
+      position: 9
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:de
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -1459,153 +3571,373 @@ griffon-38:
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
     pdu_position: 2
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:dd
-      ip: 172.18.65.38
-      hwid: "0xC903000318DC"
-      line_card: "0x000b8cffff003055"
-      position: 9
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:de
-    eth0:
-      mac: 00:E0:81:B2:C1:D8
-      ip: 172.16.65.38
-      switch_name: sgriffon2
-      switch_port: Gi1/0/9
-    eth1:
-      mac: 00:E0:81:B2:C1:D9
-    bmc:
-      mac: 00:E0:81:4F:E3:68
-      ip: 172.17.65.38
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/9
 griffon-39:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530044
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 3
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e9
-      ip: 172.18.65.39
-      hwid: "0xC903000318E8"
-      line_card: "0x000b8cffff003055"
-      position: 10
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ea
     eth0:
-      mac: 00:E0:81:B2:C1:FA
+      interface: Ethernet
       ip: 172.16.65.39
+      ip6: fe80::2e0:81ff:feb2:c1fa
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:fa
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/25
     eth1:
-      mac: 00:E0:81:B2:C1:FB
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:fb
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.39
+      ip6: fe80::202:c903:3:18e9
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318E8'
+      line_card: '0x000b8cffff003055'
+      position: 10
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ea
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:BF
       ip: 172.17.65.39
+      mac: 00:e0:81:4f:e2:bf
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/25
-griffon-40:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530045
+    serial_number: 812530044
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 4
+    pdu_position: 3
+griffon-40:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:81
-      ip: 172.18.65.40
-      hwid: "0xC90300031780"
-      line_card: "0x000b8cffff003055"
-      position: 11
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:82
+    bmc:
+      ip: 172.17.65.40
+      mac: 00:e0:81:4f:e2:c6
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/26
     eth0:
-      mac: 00:E0:81:B2:C0:CC
+      interface: Ethernet
       ip: 172.16.65.40
+      ip6: fe80::2e0:81ff:feb2:c0cc
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:cc
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/26
     eth1:
-      mac: 00:E0:81:B2:C0:CD
-    bmc:
-      mac: 00:E0:81:4F:E2:C6
-      ip: 172.17.65.40
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/26
-griffon-41:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:cd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.40
+      ip6: fe80::202:c903:3:1781
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:81
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031780'
+      line_card: '0x000b8cffff003055'
+      position: 11
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:82
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  main_memory:
+    ram_size: 16867946496
   chassis:
-    serial_number: 812530046
+    serial_number: 812530045
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 5
+    pdu_position: 4
+griffon-41:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d5
-      ip: 172.18.65.41
-      hwid: "0xC903000317D4"
-      line_card: "0x000b8cffff003055"
-      position: 12
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d6
+    bmc:
+      ip: 172.17.65.41
+      mac: 00:e0:81:4f:b5:e1
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/27
     eth0:
-      mac: 00:E0:81:B2:C4:98
+      interface: Ethernet
       ip: 172.16.65.41
+      ip6: fe80::2e0:81ff:feb2:c498
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:98
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/27
     eth1:
-      mac: 00:E0:81:B2:C4:99
-    bmc:
-      mac: 00:E0:81:4F:B5:E1
-      ip: 172.17.65.41
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/27
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:99
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.41
+      ip6: fe80::202:c903:3:17d5
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000317D4'
+      line_card: '0x000b8cffff003055'
+      position: 12
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d6
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  chassis:
+    serial_number: 812530046
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 5
 griffon-42:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.42
+      mac: 00:e0:81:4f:e3:65
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/28
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.42
+      ip6: fe80::2e0:81ff:feb2:c1ba
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:ba
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/28
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:bb
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.42
+      ip6: fe80::202:c903:2:80d1
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280D0'
+      line_card: '0x000b8cffff0030ff'
+      position: 1
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d2
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -1615,36 +3947,91 @@ griffon-42:
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
     pdu_position: 6
+griffon-43:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d1
-      ip: 172.18.65.42
-      hwid: "0xC903000280D0"
-      line_card: "0x000b8cffff0030ff"
-      position: 1
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d2
+    bmc:
+      ip: 172.17.65.43
+      mac: 00:e0:81:4f:b5:e4
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/29
     eth0:
-      mac: 00:E0:81:B2:C1:BA
-      ip: 172.16.65.42
+      interface: Ethernet
+      ip: 172.16.65.43
+      ip6: fe80::2e0:81ff:feb2:c1f4
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:f4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
-      switch_port: Gi1/0/28
+      switch_port: Gi1/0/29
     eth1:
-      mac: 00:E0:81:B2:C1:BB
-    bmc:
-      mac: 00:E0:81:4F:E3:65
-      ip: 172.17.65.42
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/28
-griffon-43:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:f5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.43
+      ip6: fe80::202:c903:2:80b9
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280B8'
+      line_card: '0x000b8cffff0030ff'
+      position: 2
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ba
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -1654,740 +4041,1785 @@ griffon-43:
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
     pdu_position: 7
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b9
-      ip: 172.18.65.43
-      hwid: "0xC903000280B8"
-      line_card: "0x000b8cffff0030ff"
-      position: 2
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ba
-    eth0:
-      mac: 00:E0:81:B2:C1:F4
-      ip: 172.16.65.43
-      switch_name: sgriffon2
-      switch_port: Gi1/0/29
-    eth1:
-      mac: 00:E0:81:B2:C1:F5
-    bmc:
-      mac: 00:E0:81:4F:B5:E4
-      ip: 172.17.65.43
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/29
 griffon-44:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530049
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 17
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d5
-      ip: 172.18.65.44
-      hwid: "0xC903000280D4"
-      line_card: "0x000b8cffff0030ff"
-      position: 3
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d6
+    bmc:
+      ip: 172.17.65.44
+      mac: 00:e0:81:4f:e2:b7
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/30
     eth0:
-      mac: 00:E0:81:B2:C1:B8
+      interface: Ethernet
       ip: 172.16.65.44
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:b8
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/30
     eth1:
-      mac: 00:E0:81:B2:C1:B9
-    bmc:
-      mac: 00:E0:81:4F:E2:B7
-      ip: 172.17.65.44
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/30
-griffon-45:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:b9
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.44
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280D4'
+      line_card: '0x000b8cffff0030ff'
+      position: 3
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d6
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530050
+    serial_number: 812530049
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 18
+    pdu_position: 17
+griffon-45:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b1
-      ip: 172.18.65.45
-      hwid: "0xC903000280B0"
-      line_card: "0x000b8cffff0030ff"
-      position: 4
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b2
+    bmc:
+      ip: 172.17.65.45
+      mac: 00:e0:81:4f:e2:c4
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/31
     eth0:
-      mac: 00:E0:81:B2:C4:94
+      interface: Ethernet
       ip: 172.16.65.45
+      ip6: fe80::2e0:81ff:feb2:c494
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:94
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/31
     eth1:
-      mac: 00:E0:81:B2:C4:95
-    bmc:
-      mac: 00:E0:81:4F:E2:C4
-      ip: 172.17.65.45
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/31
-griffon-46:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:95
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.45
+      ip6: fe80::202:c903:2:80b1
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280B0'
+      line_card: '0x000b8cffff0030ff'
+      position: 4
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b2
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   chassis:
-    serial_number: 812530051
+    serial_number: 812530050
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 19
+    pdu_position: 18
+griffon-46:
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:a9
-      ip: 172.18.65.46
-      hwid: "0xC903000280A8"
-      line_card: "0x000b8cffff0030ff"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:aa
+    bmc:
+      ip: 172.17.65.46
+      mac: 00:e0:81:4f:ca:79
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/32
     eth0:
-      mac: 00:E0:81:B1:C4:36
+      interface: Ethernet
       ip: 172.16.65.46
+      ip6: fe80::2e0:81ff:feb1:c436
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:36
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/32
     eth1:
-      mac: 00:E0:81:B1:C4:37
-    bmc:
-      mac: 00:E0:81:4F:CA:79
-      ip: 172.17.65.46
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/32
-griffon-47:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:37
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.46
+      ip6: fe80::202:c903:2:80a9
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:a9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280A8'
+      line_card: '0x000b8cffff0030ff'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:aa
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   chassis:
-    serial_number: 812530052
+    serial_number: 812530051
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 20
+    pdu_position: 19
+griffon-47:
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.47
+      ip6: fe80::2e0:81ff:feb1:c4cc
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:cc
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/33
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:cd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e1
+      interface: InfiniBand
       ip: 172.18.65.47
-      hwid: "0xC903000318E0"
+      ip6: fe80::202:c903:3:18e1
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318E0'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e2
-    eth0:
-      mac: 00:E0:81:B1:C4:CC
-      ip: 172.16.65.47
-      switch_name: sgriffon2
-      switch_port: Gi1/0/33
-    eth1:
-      mac: 00:E0:81:B1:C4:CD
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:0A
       ip: 172.17.65.47
+      mac: 00:e0:81:4f:e3:0a
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/33
-griffon-48:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530053
+    serial_number: 812530052
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 21
+    pdu_position: 20
+griffon-48:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a5
-      ip: 172.18.65.48
-      hwid: "0xC903000317A4"
-      line_card: "0x000b8cffff0030ff"
-      position: 7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a6
+    bmc:
+      ip: 172.17.65.48
+      mac: 00:e0:81:4f:ca:80
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/34
     eth0:
-      mac: 00:E0:81:B2:C0:8C
+      interface: Ethernet
       ip: 172.16.65.48
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:8c
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/34
     eth1:
-      mac: 00:E0:81:B2:C0:8D
-    bmc:
-      mac: 00:E0:81:4F:CA:80
-      ip: 172.17.65.48
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/34
-griffon-49:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:8d
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.48
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000317A4'
+      line_card: '0x000b8cffff0030ff'
+      position: 7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a6
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530054
+    serial_number: 812530053
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 22
+    pdu_position: 21
+griffon-49:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:27
-      ip: 172.18.65.49
-      hwid: "0xC90300033026"
-      line_card: "0x000b8cffff0030ff"
-      position: 8
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:28
+    bmc:
+      ip: 172.17.65.49
+      mac: 00:e0:81:4f:e2:c9
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/35
     eth0:
-      mac: 00:E0:81:B2:C2:2C
+      interface: Ethernet
       ip: 172.16.65.49
+      ip6: fe80::2e0:81ff:feb2:c22c
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:2c
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/35
     eth1:
-      mac: 00:E0:81:B2:C2:2D
-    bmc:
-      mac: 00:E0:81:4F:E2:C9
-      ip: 172.17.65.49
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/35
-griffon-50:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:2d
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.49
+      ip6: fe80::202:c903:3:3027
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:27
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033026'
+      line_card: '0x000b8cffff0030ff'
+      position: 8
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:28
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530055
+    serial_number: 812530054
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu3.nancy.grid5000.fr
-    pdu_position: 23
+    pdu_position: 22
+griffon-50:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d1
-      ip: 172.18.65.50
-      hwid: "0xC903000318D0"
-      line_card: "0x000b8cffff0030ff"
-      position: 9
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d2
+    bmc:
+      ip: 172.17.65.50
+      mac: 00:e0:81:4f:e2:fa
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/36
     eth0:
-      mac: 00:E0:81:B2:C2:10
+      interface: Ethernet
       ip: 172.16.65.50
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:10
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/37
     eth1:
-      mac: 00:E0:81:B2:C2:11
-    bmc:
-      mac: 00:E0:81:4F:E2:FA
-      ip: 172.17.65.50
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/36
-griffon-51:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:11
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.50
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318D0'
+      line_card: '0x000b8cffff0030ff'
+      position: 9
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d2
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  chassis:
+    serial_number: 812530055
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu3.nancy.grid5000.fr
+    pdu_position: 23
+griffon-51:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530056
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 21
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ed
-      ip: 172.18.65.51
-      hwid: "0xC903000318EC"
-      line_card: "0x000b8cffff0030ff"
-      position: 10
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ee
+    bmc:
+      ip: 172.17.65.51
+      mac: 00:e0:81:4f:e3:92
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/37
     eth0:
-      mac: 00:E0:81:B2:C0:9E
+      interface: Ethernet
       ip: 172.16.65.51
+      ip6: fe80::2e0:81ff:feb2:c09e
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:9e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon2
       switch_port: Gi1/0/36
     eth1:
-      mac: 00:E0:81:B2:C0:9F
-    bmc:
-      mac: 00:E0:81:4F:E3:92
-      ip: 172.17.65.51
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/37
-griffon-52:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:9f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.51
+      ip6: fe80::202:c903:3:18ed
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ed
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318EC'
+      line_card: '0x000b8cffff0030ff'
+      position: 10
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ee
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   chassis:
-    serial_number: 812530057
+    serial_number: 812530056
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 20
+    pdu_position: 21
+griffon-52:
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
+    bmc:
+      ip: 172.17.65.52
+      mac: 00:e0:81:4f:e3:7e
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/38
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.52
+      ip6: fe80::2e0:81ff:feb2:c4a8
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:a8
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/38
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:a9
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:85
+      interface: InfiniBand
       ip: 172.18.65.52
-      hwid: "0xC90300027F84"
+      ip6: fe80::202:c903:2:7f85
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:85
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300027F84'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:86
-    eth0:
-      mac: 00:E0:81:B2:C4:A8
-      ip: 172.16.65.52
-      switch_name: sgriffon2
-      switch_port: Gi1/0/38
-    eth1:
-      mac: 00:E0:81:B2:C4:A9
-    bmc:
-      mac: 00:E0:81:4F:E3:7E
-      ip: 172.17.65.52
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/38
-griffon-53:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
   chassis:
-    serial_number: 812530058
+    serial_number: 812530057
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 19
+    pdu_position: 20
+griffon-53:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.53
+      ip6: fe80::2e0:81ff:feb2:c030
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:30
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/39
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:31
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c5
+      interface: InfiniBand
       ip: 172.18.65.53
-      hwid: "0xC903000280C4"
+      ip6: fe80::202:c903:2:80c5
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000280C4'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c6
-    eth0:
-      mac: 00:E0:81:B2:C0:30
-      ip: 172.16.65.53
-      switch_name: sgriffon2
-      switch_port: Gi1/0/39
-    eth1:
-      mac: 00:E0:81:B2:C0:31
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:56
       ip: 172.17.65.53
+      mac: 00:e0:81:4f:e3:56
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/39
-griffon-54:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
-    serial_number: 812530059c
+    serial_number: 812530058
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 18
+    pdu_position: 19
+griffon-54:
+  main_memory:
+    ram_size: 16867958784
   network_interfaces:
+    bmc:
+      ip: 172.17.65.54
+      mac: 00:e0:81:4f:e2:cf
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/40
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.54
+      ip6: fe80::2e0:81ff:feb2:c0da
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:da
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/40
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:db
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:05
+      interface: InfiniBand
       ip: 172.18.65.54
-      hwid: "0xC903000318C4"
+      ip6: fe80::202:c903:4:5205
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:05
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318C4'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:06
-    eth0:
-      mac: 00:E0:81:B2:C0:DA
-      ip: 172.16.65.54
-      switch_name: sgriffon2
-      switch_port: Gi1/0/40
-    eth1:
-      mac: 00:E0:81:B2:C0:DB
-    bmc:
-      mac: 00:E0:81:4F:E2:CF
-      ip: 172.17.65.54
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/40
-griffon-55:
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530060
+    serial_number: 812530059c
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 17
+    pdu_position: 18
+griffon-55:
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.55
+      ip6: fe80::2e0:81ff:feb2:c288
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:88
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/41
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:89
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:85
+      interface: InfiniBand
       ip: 172.18.65.55
-      hwid: "0xC90300031784"
+      ip6: fe80::202:c903:3:1785
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:85
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031784'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:86
-    eth0:
-      mac: 00:E0:81:B2:C2:88
-      ip: 172.16.65.55
-      switch_name: sgriffon2
-      switch_port: Gi1/0/41
-    eth1:
-      mac: 00:E0:81:B2:C2:89
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:F8
       ip: 172.17.65.55
+      mac: 00:e0:81:4f:e2:f8
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/41
-griffon-56:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   chassis:
-    serial_number: 812530061
+    serial_number: 812530060
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 15
+    pdu_position: 17
+griffon-56:
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
+    bmc:
+      ip: 172.17.65.56
+      mac: 00:e0:81:4f:ca:89
+      switch_name: sgriffon2-ipmi
+      switch_port: 1/0/42
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.56
+      ip6: fe80::2e0:81ff:feb2:c1dc
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:dc
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/42
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:dd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6d
+      interface: InfiniBand
       ip: 172.18.65.56
-      hwid: "0xC9030003176C"
+      ip6: fe80::202:c903:3:176d
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6d
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003176C'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6e
-    eth0:
-      mac: 00:E0:81:B2:C1:DC
-      ip: 172.16.65.56
-      switch_name: sgriffon2
-      switch_port: Gi1/0/42
-    eth1:
-      mac: 00:E0:81:B2:C1:DD
-    bmc:
-      mac: 00:E0:81:4F:CA:89
-      ip: 172.17.65.56
-      switch_name: sgriffon2-ipmi
-      switch_port: 1/0/42
-griffon-57:
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
   chassis:
-    serial_number: 812530062
+    serial_number: 812530061
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu4.nancy.grid5000.fr
-    pdu_position: 14
+    pdu_position: 15
+griffon-57:
+  main_memory:
+    ram_size: 16867946496
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.57
+      ip6: fe80::2e0:81ff:feb2:bfec
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:ec
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon2
+      switch_port: Gi1/0/43
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:ed
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3d
+      interface: InfiniBand
       ip: 172.18.65.57
-      hwid: "0xC9030003173C"
+      ip6: fe80::202:c903:3:173d
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3d
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003173C'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3e
-    eth0:
-      mac: 00:E0:81:B2:BF:EC
-      ip: 172.16.65.57
-      switch_name: sgriffon2
-      switch_port: Gi1/0/43
-    eth1:
-      mac: 00:E0:81:B2:BF:ED
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:DE
       ip: 172.17.65.57
+      mac: 00:e0:81:4f:e2:de
       switch_name: sgriffon2-ipmi
       switch_port: 1/0/43
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  chassis:
+    serial_number: 812530062
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu4.nancy.grid5000.fr
+    pdu_position: 14
 griffon-58:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530063
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 1
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
+    bmc:
+      ip: 172.17.65.58
+      mac: 00:e0:81:4f:e2:f3
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/12
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.58
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:28
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon1
+      switch_port: Gi1/0/11
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:29
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d
+      interface: InfiniBand
       ip: 172.18.65.58
-      hwid: "0xC9030003179C"
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003179C'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9e
-    eth0:
-      mac: 00:E0:81:B2:C0:28
-      ip: 172.16.65.58
-      switch_name: sgriffon1
-      switch_port: Gi1/0/11
-    eth1:
-      mac: 00:E0:81:B2:C0:29
-    bmc:
-      mac: 00:E0:81:4F:E2:F3
-      ip: 172.17.65.58
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/12
-griffon-59:
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530064
+    serial_number: 812530063
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu1.nancy.grid5000.fr
-    pdu_position: 2
+    pdu_position: 1
+griffon-59:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31
-      ip: 172.18.65.59
-      hwid: "0xC90300031730"
-      line_card: "0x000b8cffff00304d"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:32
+    bmc:
+      ip: 172.17.65.59
+      mac: 00:e0:81:4f:e3:05
+      switch_name: sgriffon1-ipmi
+      switch_port: 1/0/11
     eth0:
-      mac: 00:E0:81:B2:C1:F8
+      interface: Ethernet
       ip: 172.16.65.59
+      ip6: fe80::2e0:81ff:feb2:c1f8
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:f8
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
       switch_port: Gi1/0/12
     eth1:
-      mac: 00:E0:81:B2:C1:F9
-    bmc:
-      mac: 00:E0:81:4F:E3:05
-      ip: 172.17.65.59
-      switch_name: sgriffon1-ipmi
-      switch_port: 1/0/11
-griffon-60:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:f9
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.59
+      ip6: fe80::202:c903:3:1731
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031730'
+      line_card: '0x000b8cffff00304d'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:32
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  chassis:
+    serial_number: 812530064
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu1.nancy.grid5000.fr
+    pdu_position: 2
+griffon-60:
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530065
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu2.nancy.grid5000.fr
-    pdu_position: 5
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41
-      ip: 172.18.65.60
-      hwid: "0xC90300031740"
-      line_card: "0x000b8cffff00304d"
-      position: 6
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:42
     eth0:
-      mac: 00:E0:81:B2:BF:F4
+      interface: Ethernet
       ip: 172.16.65.60
+      ip6: fe80::2e0:81ff:feb2:bff4
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:f4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon1
       switch_port: Gi1/0/13
     eth1:
-      mac: 00:E0:81:B2:BF:F5
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:f5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.60
+      ip6: fe80::202:c903:3:1741
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031740'
+      line_card: '0x000b8cffff00304d'
+      position: 6
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:42
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:90
       ip: 172.17.65.60
+      mac: 00:e0:81:4f:e3:90
       switch_name: sgriffon1-ipmi
       switch_port: 1/0/13
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: 812530065
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu2.nancy.grid5000.fr
+    pdu_position: 5
 griffon-61:
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
-  chassis:
-    serial_number: 812530066
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 3
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:05
-      ip: 172.18.65.61
-      hwid: "0xC90300031804"
-      line_card: "0x000b8cffff00304d"
-      position: 7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:06
     eth0:
-      mac: 00:E0:81:B2:C1:E2
+      interface: Ethernet
       ip: 172.16.65.61
+      ip6: fe80::2e0:81ff:feb2:c1e2
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:e2
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/4
     eth1:
-      mac: 00:E0:81:B2:C1:E3
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:e3
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.61
+      ip6: fe80::202:c903:3:1805
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:05
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031804'
+      line_card: '0x000b8cffff00304d'
+      position: 7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:06
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4B:FC:D2
       ip: 172.17.65.61
+      mac: 00:e0:81:4b:fc:d2
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/4
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  chassis:
+    serial_number: 812530066
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 3
 griffon-62:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.62
+      mac: 00:e0:81:4f:e2:b8
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/5
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.62
+      ip6: fe80::2e0:81ff:feb2:c1d6
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:d6
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/5
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:d7
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.62
+      ip6: fe80::202:c903:3:185d
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5d
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003185C'
+      line_card: '0x000b8cffff00304d'
+      position: 8
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5e
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
     serial_number: 812530067
     manufacturer: TYAN Computer Corporation
@@ -2395,77 +5827,187 @@ griffon-62:
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
     pdu_position: 2
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5d
-      ip: 172.18.65.62
-      hwid: "0xC9030003185C"
-      line_card: "0x000b8cffff00304d"
-      position: 8
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5e
-    eth0:
-      mac: 00:E0:81:B2:C1:D6
-      ip: 172.16.65.62
-      switch_name: sgriffon3
-      switch_port: Gi1/0/5
-    eth1:
-      mac: 00:E0:81:B2:C1:D7
-    bmc:
-      mac: 00:E0:81:4F:E2:B8
-      ip: 172.17.65.62
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/5
 griffon-63:
+  supported_job_types:
+    virtual: ivt
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530068
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 1
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b5
-      ip: 172.18.65.63
-      hwid: "0xC903000317B4"
-      line_card: "0x000b8cffff00304d"
-      position: 9
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b6
     eth0:
-      mac: 00:E0:81:B1:C3:84
+      interface: Ethernet
       ip: 172.16.65.63
+      ip6: fe80::2e0:81ff:feb1:c384
+      driver: e1000e
+      mac: 00:e0:81:b1:c3:84
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/6
     eth1:
-      mac: 00:E0:81:B1:C3:85
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b1:c3:85
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.63
+      ip6: fe80::202:c903:3:17b5
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000317B4'
+      line_card: '0x000b8cffff00304d'
+      position: 9
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b6
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:0B
       ip: 172.17.65.63
+      mac: 00:e0:81:4f:e3:0b
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/6
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  chassis:
+    serial_number: 812530068
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 1
 griffon-64:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.64
+      mac: 00:e0:81:4f:e2:cd
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/7
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.64
+      ip6: fe80::2e0:81ff:feb2:c248
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:48
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/7
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:49
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.64
+      ip6: fe80::202:c903:3:3013
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:13
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300033012'
+      line_card: '0x000b8cffff00304d'
+      position: 10
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:14
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: 812530069
     manufacturer: TYAN Computer Corporation
@@ -2473,974 +6015,2349 @@ griffon-64:
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
     pdu_position: 8
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:13
-      ip: 172.18.65.64
-      hwid: "0xC90300033012"
-      line_card: "0x000b8cffff00304d"
-      position: 10
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:14
-    eth0:
-      mac: 00:E0:81:B2:C2:48
-      ip: 172.16.65.64
-      switch_name: sgriffon3
-      switch_port: Gi1/0/7
-    eth1:
-      mac: 00:E0:81:B2:C2:49
-    bmc:
-      mac: 00:E0:81:4F:E2:CD
-      ip: 172.17.65.64
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/7
 griffon-65:
+  supported_job_types:
+    virtual: ivt
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530070
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 2
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:51
-      ip: 172.18.65.65
-      hwid: "0xC90300031750"
-      line_card: "0x000b8cffff00304d"
-      position: 11
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:52
     eth0:
-      mac: 00:E0:81:B1:C4:D4
+      interface: Ethernet
       ip: 172.16.65.65
+      ip6: fe80::2e0:81ff:feb1:c4d4
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:d4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/8
     eth1:
-      mac: 00:E0:81:B1:C4:D5
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b1:c4:d5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.65
+      ip6: fe80::202:c903:3:1751
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:51
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031750'
+      line_card: '0x000b8cffff00304d'
+      position: 11
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:52
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:BC
       ip: 172.17.65.65
+      mac: 00:e0:81:4f:e2:bc
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/8
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  chassis:
+    serial_number: 812530070
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 2
 griffon-66:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530071
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 3
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:69
-      ip: 172.18.65.66
-      hwid: "0xC90300031968"
-      line_card: "0x000b8cffff00304d"
-      position: 12
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:6a
     eth0:
-      mac: 00:E0:81:B2:C0:2E
+      interface: Ethernet
       ip: 172.16.65.66
+      ip6: fe80::2e0:81ff:feb2:c02e
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:2e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/9
     eth1:
-      mac: 00:E0:81:B2:C0:2F
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:2f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.66
+      ip6: fe80::202:c903:3:1969
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:69
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031968'
+      line_card: '0x000b8cffff00304d'
+      position: 12
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:6a
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CA:78
       ip: 172.17.65.66
+      mac: 00:e0:81:4f:ca:78
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/9
-griffon-67:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530072
+    serial_number: 812530071
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 4
+    pdu_position: 3
+griffon-67:
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:dd
-      ip: 172.18.65.67
-      hwid: "0xC903000317DC"
-      line_card: "0x000b8cffff003107"
-      position: 1
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:de
+    bmc:
+      ip: 172.17.65.67
+      mac: 00:e0:81:4f:b5:f0
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/10
     eth0:
-      mac: 00:E0:81:B2:BF:F2
+      interface: Ethernet
       ip: 172.16.65.67
+      ip6: fe80::2e0:81ff:feb2:bff2
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:f2
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/10
     eth1:
-      mac: 00:E0:81:B2:BF:F3
-    bmc:
-      mac: 00:E0:81:4F:B5:F0
-      ip: 172.17.65.67
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/10
-griffon-68:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:f3
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.67
+      ip6: fe80::202:c903:3:17dd
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:dd
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000317DC'
+      line_card: '0x000b8cffff003107'
+      position: 1
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:de
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
-    serial_number: 812530073
+    serial_number: 812530072
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 5
+    pdu_position: 4
+griffon-68:
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:59
-      ip: 172.18.65.68
-      hwid: "0xC90300031858"
-      line_card: "0x000b8cffff003107"
-      position: 2
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5a
     eth0:
-      mac: 00:E0:81:B2:C1:70
+      interface: Ethernet
       ip: 172.16.65.68
+      ip6: fe80::2e0:81ff:feb2:c170
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:70
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/11
     eth1:
-      mac: 00:E0:81:B2:C1:71
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:71
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.68
+      ip6: fe80::202:c903:3:1859
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:59
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031858'
+      line_card: '0x000b8cffff003107'
+      position: 2
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5a
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CA:8F
       ip: 172.17.65.68
+      mac: 00:e0:81:4f:ca:8f
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/11
-griffon-69:
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  chassis:
+    serial_number: 812530073
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 5
+griffon-69:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530074
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 6
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b1
-      ip: 172.18.65.69
-      hwid: "0xC903000317B0"
-      line_card: "0x000b8cffff003107"
-      position: 3
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b2
+    bmc:
+      ip: 172.17.65.69
+      mac: 00:e0:81:4f:b5:dc
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/12
     eth0:
-      mac: 00:E0:81:B2:C1:3A
+      interface: Ethernet
       ip: 172.16.65.69
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:3a
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/12
     eth1:
-      mac: 00:E0:81:B2:C1:3B
-    bmc:
-      mac: 00:E0:81:4F:B5:DC
-      ip: 172.17.65.69
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/12
-griffon-70:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:3b
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.69
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: false
+      management: false
+      hwid: '0xC903000317B0'
+      line_card: '0x000b8cffff003107'
+      position: 3
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b2
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530075
+    serial_number: 812530074
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 7
+    pdu_position: 6
+griffon-70:
+  main_memory:
+    ram_size: 16867946496
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:11
-      ip: 172.18.65.70
-      hwid: "0xC90300031810"
-      line_card: "0x000b8cffff003107"
-      position: 4
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:12
     eth0:
-      mac: 00:E0:81:B2:BF:8A
+      interface: Ethernet
       ip: 172.16.65.70
+      ip6: fe80::2e0:81ff:feb2:bf8a
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:8a
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/13
     eth1:
-      mac: 00:E0:81:B2:BF:8B
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:8b
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.70
+      ip6: fe80::202:c903:3:1811
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:11
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031810'
+      line_card: '0x000b8cffff003107'
+      position: 4
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:12
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CA:77
       ip: 172.17.65.70
+      mac: 00:e0:81:4f:ca:77
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/13
-griffon-71:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
-    serial_number: 812530076
+    serial_number: 812530075
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 8
+    pdu_position: 7
+griffon-71:
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:25
-      ip: 172.18.65.71
-      hwid: "0xC90300031824"
-      line_card: "0x000b8cffff003107"
-      position: 5
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:26
     eth0:
-      mac: 00:E0:81:B2:BF:CE
+      interface: Ethernet
       ip: 172.16.65.71
+      ip6: fe80::2e0:81ff:feb2:bfce
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:ce
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/14
     eth1:
-      mac: 00:E0:81:B2:BF:CF
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:cf
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.71
+      ip6: fe80::202:c903:3:1825
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:25
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031824'
+      line_card: '0x000b8cffff003107'
+      position: 5
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:26
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CB:05
       ip: 172.17.65.71
+      mac: 00:e0:81:4f:cb:05
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/14
-griffon-72:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530077
+    serial_number: 812530076
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 9
+    pdu_position: 8
+griffon-72:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cf
-      ip: 172.18.65.72
-      hwid: "0xC90300032FCE"
-      line_card: "0x000b8cffff003107"
-      position: 6
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d0
+    bmc:
+      ip: 172.17.65.72
+      mac: 00:e0:81:4f:b5:f1
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/15
     eth0:
-      mac: 00:E0:81:B2:C4:D6
+      interface: Ethernet
       ip: 172.16.65.72
+      ip6: fe80::2e0:81ff:feb2:c4d6
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:d6
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/15
     eth1:
-      mac: 00:E0:81:B2:C4:D7
-    bmc:
-      mac: 00:E0:81:4F:B5:F1
-      ip: 172.17.65.72
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/15
-griffon-73:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:d7
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.72
+      ip6: fe80::202:c903:3:2fcf
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cf
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300032FCE'
+      line_card: '0x000b8cffff003107'
+      position: 6
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d0
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530078
+    serial_number: 812530077
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 10
+    pdu_position: 9
+griffon-73:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fd
-      ip: 172.18.65.73
-      hwid: "0xC903000319FC"
-      line_card: "0x000b8cffff003107"
-      position: 7
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fe
+    bmc:
+      ip: 172.17.65.73
+      mac: 00:e0:81:4f:cb:0d
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/25
     eth0:
-      mac: 00:E0:81:B2:C4:BA
+      interface: Ethernet
       ip: 172.16.65.73
+      ip6: fe80::2e0:81ff:feb2:c4ba
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:ba
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/25
     eth1:
-      mac: 00:E0:81:B2:C4:BB
-    bmc:
-      mac: 00:E0:81:4F:CB:0D
-      ip: 172.17.65.73
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/25
-griffon-74:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:bb
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.73
+      ip6: fe80::202:c903:3:19fd
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fd
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000319FC'
+      line_card: '0x000b8cffff003107'
+      position: 7
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fe
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  supported_job_types:
+    virtual: ivt
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
-    serial_number: 812530079
+    serial_number: 812530078
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 11
+    pdu_position: 10
+griffon-74:
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:91
-      ip: 172.18.65.74
-      hwid: "0xC90300031890"
-      line_card: "0x000b8cffff003107"
-      position: 8
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:92
+    bmc:
+      ip: 172.17.65.74
+      mac: 00:e0:81:4f:cb:00
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/26
     eth0:
-      mac: 00:E0:81:B2:C0:94
+      interface: Ethernet
       ip: 172.16.65.74
+      ip6: fe80::2e0:81ff:feb2:c094
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:94
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/26
     eth1:
-      mac: 00:E0:81:B2:C0:95
-    bmc:
-      mac: 00:E0:81:4F:CB:00
-      ip: 172.17.65.74
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/26
-griffon-75:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:95
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.74
+      ip6: fe80::202:c903:3:1891
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:91
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031890'
+      line_card: '0x000b8cffff003107'
+      position: 8
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:92
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530080
+    serial_number: 812530079
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 13
+    pdu_position: 11
+griffon-75:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:75
-      ip: 172.18.65.75
-      hwid: "0xC90300031874"
-      line_card: "0x000b8cffff003107"
-      position: 9
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:76
+    bmc:
+      ip: 172.17.65.75
+      mac: 00:e0:81:4f:e3:75
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/27
     eth0:
-      mac: 00:E0:81:B2:C1:D2
+      interface: Ethernet
       ip: 172.16.65.75
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:d2
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/27
     eth1:
-      mac: 00:E0:81:B2:C1:D3
-    bmc:
-      mac: 00:E0:81:4F:E3:75
-      ip: 172.17.65.75
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/27
-griffon-76:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:d3
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.75
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:75
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031874'
+      line_card: '0x000b8cffff003107'
+      position: 9
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:76
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  chassis:
+    serial_number: 812530080
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 13
+griffon-76:
+  bios:
     vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530081
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 14
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:75
-      ip: 172.18.65.76
-      hwid: "0xC90300031974"
-      line_card: "0x000b8cffff003107"
-      position: 10
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:76
+    bmc:
+      ip: 172.17.65.76
+      mac: 00:e0:81:4f:b5:e3
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/28
     eth0:
-      mac: 00:E0:81:B2:C1:24
+      interface: Ethernet
       ip: 172.16.65.76
+      ip6: fe80::2e0:81ff:feb2:c124
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:24
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/28
     eth1:
-      mac: 00:E0:81:B2:C1:25
-    bmc:
-      mac: 00:E0:81:4F:B5:E3
-      ip: 172.17.65.76
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/28
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:25
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.76
+      ip6: fe80::202:c903:3:1975
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:75
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031974'
+      line_card: '0x000b8cffff003107'
+      position: 10
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:76
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
+  chassis:
+    serial_number: 812530081
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 14
 griffon-77:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
-  chassis:
-    serial_number: 812530082
-    manufacturer: TYAN Computer Corporation
-    product_name: S5393
-  pdu:
-    pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 15
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:b9
-      ip: 172.18.65.77
-      hwid: "0xC903000318B8"
-      line_card: "0x000b8cffff003107"
-      position: 11
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ba
     eth0:
-      mac: 00:E0:81:B2:BF:F0
+      interface: Ethernet
       ip: 172.16.65.77
+      ip6: fe80::2e0:81ff:feb2:bff0
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:f0
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/29
     eth1:
-      mac: 00:E0:81:B2:BF:F1
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:f1
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.77
+      ip6: fe80::202:c903:3:18b9
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:b9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000318B8'
+      line_card: '0x000b8cffff003107'
+      position: 11
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ba
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:E0
       ip: 172.17.65.77
+      mac: 00:e0:81:4f:e2:e0
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/29
-griffon-78:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  supported_job_types:
+    virtual: ivt
   chassis:
-    serial_number: 812530083
+    serial_number: 812530082
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 17
+    pdu_position: 15
+griffon-78:
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ad
-      ip: 172.18.65.78
-      hwid: "0xC903000317AC"
-      line_card: "0x000b8cffff003107"
-      position: 12
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ae
+    bmc:
+      ip: 172.17.65.78
+      mac: 00:e0:81:4f:e2:e8
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/30
     eth0:
-      mac: 00:E0:81:B2:C2:44
+      interface: Ethernet
       ip: 172.16.65.78
+      ip6: fe80::2e0:81ff:feb2:c244
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:44
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/30
     eth1:
-      mac: 00:E0:81:B2:C2:45
-    bmc:
-      mac: 00:E0:81:4F:E2:E8
-      ip: 172.17.65.78
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/30
-griffon-79:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:45
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.78
+      ip6: fe80::202:c903:3:17ad
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ad
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000317AC'
+      line_card: '0x000b8cffff003107'
+      position: 12
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ae
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
   chassis:
-    serial_number: 812530084
+    serial_number: 812530083
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 18
+    pdu_position: 17
+griffon-79:
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.79
+      ip6: fe80::2e0:81ff:feb2:c4b8
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:b8
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/31
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:b9
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:09
+      interface: InfiniBand
       ip: 172.18.65.79
-      hwid: "0xC90300031808"
+      ip6: fe80::202:c903:3:1809
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:09
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031808'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0a
-    eth0:
-      mac: 00:E0:81:B2:C4:B8
-      ip: 172.16.65.79
-      switch_name: sgriffon3
-      switch_port: Gi1/0/31
-    eth1:
-      mac: 00:E0:81:B2:C4:B9
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:B2
       ip: 172.17.65.79
+      mac: 00:e0:81:4f:e2:b2
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/31
-griffon-80:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867958784
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
-    serial_number: 812530085
+    serial_number: 812530084
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 19
+    pdu_position: 18
+griffon-80:
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.80
+      ip6: fe80::2e0:81ff:feb2:c1f6
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:f6
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/32
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:f7
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:01
+      interface: InfiniBand
       ip: 172.18.65.80
-      hwid: "0xC90300031800"
+      ip6: fe80::202:c903:3:1801
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:01
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031800'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:02
-    eth0:
-      mac: 00:E0:81:B2:C1:F6
-      ip: 172.16.65.80
-      switch_name: sgriffon3
-      switch_port: Gi1/0/32
-    eth1:
-      mac: 00:E0:81:B2:C1:F7
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:B5:AF
       ip: 172.17.65.80
+      mac: 00:e0:81:4f:b5:af
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/32
-griffon-81:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530086
+    serial_number: 812530085
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 20
+    pdu_position: 19
+griffon-81:
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
+    bmc:
+      ip: 172.17.65.81
+      mac: 00:e0:81:4f:ca:7d
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/33
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.81
+      ip6: fe80::2e0:81ff:feb2:c572
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:72
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/33
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:73
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:61
+      interface: InfiniBand
       ip: 172.18.65.81
-      hwid: "0xC90300031860"
+      ip6: fe80::202:c903:3:1861
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:61
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031860'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:62
-    eth0:
-      mac: 00:E0:81:B2:C5:72
-      ip: 172.16.65.81
-      switch_name: sgriffon3
-      switch_port: Gi1/0/33
-    eth1:
-      mac: 00:E0:81:B2:C5:73
-    bmc:
-      mac: 00:E0:81:4F:CA:7D
-      ip: 172.17.65.81
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/33
-griffon-82:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  main_memory:
+    ram_size: 16867946496
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530087
+    serial_number: 812530086
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 21
+    pdu_position: 20
+griffon-82:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
+    bmc:
+      ip: 172.17.65.82
+      mac: 00:e0:81:4f:cb:08
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/34
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.82
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:7e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/34
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c1:7f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f9
+      interface: InfiniBand
       ip: 172.18.65.82
-      hwid: "0xC903000319F8"
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f9
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000319F8'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fa
-    eth0:
-      mac: 00:E0:81:B2:C1:7E
-      ip: 172.16.65.82
-      switch_name: sgriffon3
-      switch_port: Gi1/0/34
-    eth1:
-      mac: 00:E0:81:B2:C1:7F
-    bmc:
-      mac: 00:E0:81:4F:CB:08
-      ip: 172.17.65.82
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/34
-griffon-83:
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530088
+    serial_number: 812530087
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 22
+    pdu_position: 21
+griffon-83:
+  supported_job_types:
+    virtual: ivt
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f5
-      ip: 172.18.65.83
-      hwid: "0xC903000319F4"
-      line_card: "0x000b8cffff003101"
-      position: 12
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f6
+    bmc:
+      ip: 172.17.65.83
+      mac: 00:e0:81:4f:ca:9f
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/35
     eth0:
-      mac: 00:E0:81:B2:C2:40
+      interface: Ethernet
       ip: 172.16.65.83
+      ip6: fe80::2e0:81ff:feb2:c240
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:40
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/35
     eth1:
-      mac: 00:E0:81:B2:C2:41
-    bmc:
-      mac: 00:E0:81:4F:CA:9F
-      ip: 172.17.65.83
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/35
-griffon-84:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:41
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.83
+      ip6: fe80::202:c903:3:19f5
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f5
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000319F4'
+      line_card: '0x000b8cffff003101'
+      position: 12
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f6
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
   chassis:
-    serial_number: 812530089
+    serial_number: 812530088
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu5.nancy.grid5000.fr
-    pdu_position: 23
+    pdu_position: 22
+griffon-84:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0d
-      ip: 172.18.65.84
-      hwid: "0xC9030003180C"
-      line_card:
-      position:
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0e
+    bmc:
+      ip: 172.17.65.84
+      mac: 00:e0:81:4f:e2:d9
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/36
     eth0:
-      mac: 00:E0:81:B2:C2:4E
+      interface: Ethernet
       ip: 172.16.65.84
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:4e
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
       switch_name: sgriffon3
       switch_port: Gi1/0/36
     eth1:
-      mac: 00:E0:81:B2:C2:4F
-    bmc:
-      mac: 00:E0:81:4F:E2:D9
-      ip: 172.17.65.84
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/36
-griffon-85:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:4f
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.84
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0d
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC9030003180C'
+      line_card:
+      position:
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0e
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530090
+    serial_number: 812530089
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
-    pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 21
+    pdu_name: griffon-pdu5.nancy.grid5000.fr
+    pdu_position: 23
+griffon-85:
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.85
+      ip6: fe80::2e0:81ff:feb2:c5bc
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:bc
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/37
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:bd
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f1
+      interface: InfiniBand
       ip: 172.18.65.85
-      hwid: "0xC903000319F0"
+      ip6: fe80::202:c903:3:19f1
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f1
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC903000319F0'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f2
-    eth0:
-      mac: 00:E0:81:B2:C5:BC
-      ip: 172.16.65.85
-      switch_name: sgriffon3
-      switch_port: Gi1/0/37
-    eth1:
-      mac: 00:E0:81:B2:C5:BD
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:B5:E7
       ip: 172.17.65.85
+      mac: 00:e0:81:4f:b5:e7
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/37
-griffon-86:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  main_memory:
+    ram_size: 16867946496
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
-    serial_number: 812530091
+    serial_number: 812530090
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 20
+    pdu_position: 21
+griffon-86:
+  main_memory:
+    ram_size: 16867946496
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
+    bmc:
+      ip: 172.17.65.86
+      mac: 00:e0:81:4f:cb:0f
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/39
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.86
+      ip6: fe80::2e0:81ff:feb2:c4ac
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:3a
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/38
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c2:3b
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:01
+      interface: InfiniBand
       ip: 172.18.65.86
-      hwid: "0xC90300031A00"
+      ip6: fe80::202:c903:2:8055
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:01
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A00'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:02
-    eth0:
-      mac: 00:E0:81:B2:C2:3A
-      ip: 172.16.65.86
-      switch_name: sgriffon3
-      switch_port: Gi1/0/38
-    eth1:
-      mac: 00:E0:81:B2:C2:3B
-    bmc:
-      mac: 00:E0:81:4F:CB:0F
-      ip: 172.17.65.86
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/39
-griffon-87:
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
   chassis:
-    serial_number: 812530092
+    serial_number: 812530091
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 19
+    pdu_position: 20
+griffon-87:
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.87
+      ip6: fe80::2e0:81ff:feb2:bf82
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:82
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/39
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:83
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:05
+      interface: InfiniBand
       ip: 172.18.65.87
-      hwid: "0xC90300031A04"
+      ip6: fe80::202:c903:3:1a05
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:05
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A04'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:06
-    eth0:
-      mac: 00:E0:81:B2:BF:82
-      ip: 172.16.65.87
-      switch_name: sgriffon3
-      switch_port: Gi1/0/39
-    eth1:
-      mac: 00:E0:81:B2:BF:83
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E2:BD
       ip: 172.17.65.87
+      mac: 00:e0:81:4f:e2:bd
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/40
-griffon-88:
+  main_memory:
+    ram_size: 16867946496
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
-  block_devices:
-    sda:
-      model: HDP725032GLA360
-      size: 625142448
-      rev: GM3OA5CA
-      vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   chassis:
-    serial_number: 812530093
+    serial_number: 812530092
     manufacturer: TYAN Computer Corporation
     product_name: S5393
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
-    pdu_position: 18
+    pdu_position: 19
+griffon-88:
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  block_devices:
+    sda:
+      device: sda
+      size: 320072933376
+      model: HDP725032GLA360
+      rev: GM3OA5CA
+      vendor: Hitachi
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.88
+      ip6: fe80::2e0:81ff:feb2:c4ce
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:ce
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/40
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c4:cf
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:19
+      interface: InfiniBand
       ip: 172.18.65.88
-      hwid: "0xC90300031A18"
+      ip6: fe80::202:c903:3:1a19
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:19
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A18'
       line_card:
       position:
     ib1:
+      interface: InfiniBand
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:1a
-    eth0:
-      mac: 00:E0:81:B2:C4:CE
-      ip: 172.16.65.88
-      switch_name: sgriffon3
-      switch_port: Gi1/0/40
-    eth1:
-      mac: 00:E0:81:B2:C4:CF
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:8C
       ip: 172.17.65.88
+      mac: 00:e0:81:4f:e3:8c
       switch_name: sgriffon3-ipmi
       switch_port: 1/0/41
-griffon-89:
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
+  supported_job_types:
+    virtual: ivt
+  chassis:
+    serial_number: 812530093
+    manufacturer: TYAN Computer Corporation
+    product_name: S5393
+  pdu:
+    pdu_name: griffon-pdu6.nancy.grid5000.fr
+    pdu_position: 18
+griffon-89:
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  supported_job_types:
+    virtual: ivt
+  network_interfaces:
+    bmc:
+      ip: 172.17.65.89
+      mac: 00:e0:81:4f:e3:81
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/42
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.89
+      ip6: fe80::2e0:81ff:feb2:c5d4
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:d4
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/41
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c5:d5
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+    ib0:
+      interface: InfiniBand
+      ip: 172.18.65.89
+      ip6: fe80::202:c903:3:1a65
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:65
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A64'
+      line_card:
+      position:
+    ib1:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:66
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  main_memory:
+    ram_size: 16867946496
   chassis:
     serial_number: 812530094
     manufacturer: TYAN Computer Corporation
@@ -3448,38 +8365,93 @@ griffon-89:
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
     pdu_position: 17
+griffon-90:
+  supported_job_types:
+    virtual: ivt
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.90
+      ip6: fe80::2e0:81ff:feb2:c046
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:46
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/42
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:c0:47
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:65
-      ip: 172.18.65.89
-      hwid: "0xC90300031A64"
+      interface: InfiniBand
+      ip: 172.18.65.90
+      ip6: fe80::202:c903:3:1a21
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:21
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A20'
       line_card:
       position:
     ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:66
-    eth0:
-      mac: 00:E0:81:B2:C5:D4
-      ip: 172.16.65.89
-      switch_name: sgriffon3
-      switch_port: Gi1/0/41
-    eth1:
-      mac: 00:E0:81:B2:C5:D5
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:22
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:E3:81
-      ip: 172.17.65.89
+      ip: 172.17.65.90
+      mac: 00:e0:81:4f:ca:fc
       switch_name: sgriffon3-ipmi
-      switch_port: 1/0/42
-griffon-90:
-  bios:
-    version: V1.05
-    release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+      switch_port: 1/0/43
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
+  bios:
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+    release_date: (08/21/2009)
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
   chassis:
     serial_number: 812530095
     manufacturer: TYAN Computer Corporation
@@ -3487,38 +8459,93 @@ griffon-90:
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
     pdu_position: 15
+griffon-91:
   network_interfaces:
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.91
+      ip6: fe80::2e0:81ff:feb5:8f94
+      driver: e1000e
+      mac: 00:e0:81:b5:8f:94
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/43
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b5:8f:95
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:21
-      ip: 172.18.65.90
-      hwid: "0xC90300031A20"
+      interface: InfiniBand
+      ip: 172.18.65.91
+      ip6: fe80::202:c903:0:7b25
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:25
+      rate: 20000000000
+      version: MT25418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A0C'
       line_card:
       position:
     ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:22
-    eth0:
-      mac: 00:E0:81:B2:C0:46
-      ip: 172.16.65.90
-      switch_name: sgriffon3
-      switch_port: Gi1/0/42
-    eth1:
-      mac: 00:E0:81:B2:C0:47
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:26
+      rate: 8000000000
+      version: MT25418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     bmc:
-      mac: 00:E0:81:4F:CA:FC
-      ip: 172.17.65.90
+      ip: 172.17.65.91
+      mac: 00:e0:81:4f:28:b8
       switch_name: sgriffon3-ipmi
-      switch_port: 1/0/43
-griffon-91:
+      switch_port: 1/0/44
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: Hitachi HDT72103
-      size: 625142448
       rev: ST2O
       vendor: Hitachi
+  main_memory:
+    ram_size: 16867946496
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
+  supported_job_types:
+    virtual: ivt
   chassis:
     serial_number: 812530096
     manufacturer: TYAN Computer Corporation
@@ -3526,36 +8553,91 @@ griffon-91:
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
     pdu_position: 14
+griffon-92:
+  supported_job_types:
+    virtual: ivt
+  architecture:
+    smp_size: 2
+    smt_size: 8
+    platform_type: x86_64
+  main_memory:
+    ram_size: 16867946496
   network_interfaces:
+    bmc:
+      ip: 172.17.65.92
+      mac: 00:e0:81:4f:e3:5d
+      switch_name: sgriffon3-ipmi
+      switch_port: 1/0/45
+    eth0:
+      interface: Ethernet
+      ip: 172.16.65.92
+      ip6: fe80::2e0:81ff:feb2:bfde
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:de
+      rate: 1000000000
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      switch_name: sgriffon3
+      switch_port: Gi1/0/44
+    eth1:
+      interface: Ethernet
+      driver: e1000e
+      mac: 00:e0:81:b2:bf:df
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
     ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:25
-      ip: 172.18.65.91
-      hwid: "0xC90300031A0C"
+      interface: InfiniBand
+      ip: 172.18.65.92
+      ip6: fe80::202:c903:3:1a09
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:09
+      rate: 20000000000
+      version: MT26418
+      enabled: true
+      mountable: true
+      mounted: true
+      management: false
+      hwid: '0xC90300031A08'
       line_card:
       position:
     ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:26
-    eth0:
-      mac: 00:E0:81:B5:8F:94
-      ip: 172.16.65.91
-      switch_name: sgriffon3
-      switch_port: Gi1/0/43
-    eth1:
-      mac: 00:E0:81:B5:8F:95
-    bmc:
-      mac: 00:E0:81:4F:28:B8
-      ip: 172.17.65.91
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/44
-griffon-92:
+      interface: InfiniBand
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:0a
+      rate: 28000000000
+      version: MT26418
+      enabled: false
+      mountable: false
+      mounted: false
+      management: false
+  processor:
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    version: L5420
+    vendor: Intel
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    cache_l1i: 32768
+    cache_l1d: 32768
+    cache_l2: 6291456
+    cache_l3: 0
   bios:
+    vendor: Phoenix Technologies LTD
     version: V1.05
     release_date: (08/21/2009)
-    vendor: Phoenix Technologies LTD
+  operating_system:
+    name: debian
+    kernel: ! '#1 SMP Debian 3.2.35-2'
+    version: 7.0
   block_devices:
     sda:
+      device: sda
+      size: 320072933376
       model: HDP725032GLA360
-      size: 625142448
       rev: GM3OA5CA
       vendor: Hitachi
   chassis:
@@ -3565,24 +8647,3 @@ griffon-92:
   pdu:
     pdu_name: griffon-pdu6.nancy.grid5000.fr
     pdu_position: 13
-  network_interfaces:
-    ib0:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:09
-      ip: 172.18.65.92
-      hwid: "0xC90300031A08"
-      line_card:
-      position:
-    ib1:
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:0a
-    eth0:
-      mac: 00:E0:81:B2:BF:DE
-      ip: 172.16.65.92
-      switch_name: sgriffon3
-      switch_port: Gi1/0/44
-    eth1:
-      mac: 00:E0:81:B2:BF:DF
-    bmc:
-      mac: 00:E0:81:4F:E3:5D
-      ip: 172.17.65.92
-      switch_name: sgriffon3-ipmi
-      switch_port: 1/0/45