diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
index c45f5acb53e97ce9d9937b712d979f959bac7cd1..5385550a4882c6eb0c89d2667f63fe9cde7cf330 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml
@@ -1,70 +1,71 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: WDC WD2502ABYS-0
-      size: 251059544064
-      rev: 3.0
-      vendor: Western Digital
+    version: R4222X80
+  chassis:
+    manufacturer: Bull SAS
+    name: bullx
+    serial: '1234567890'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:3d41
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.7
-      driver: mlx4_core
-      mountable: true
+    bmc:
+      ip: 172.17.18.7
+      mac: 00:30:48:cc:b5:e4
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c6:80
-      ip6: fe80::230:48ff:fecd:c680
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.18.7
-    eth1:
-      mounted: false
-      mac: 00:30:48:cd:c6:81
+      ip6: fe80::230:48ff:fecd:c680
+      mac: 00:30:48:cd:c6:80
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 00:30:48:cd:c6:81
+      management: false
       mountable: false
-    bmc:
-      mac: 00:30:48:cc:b5:e4
-      ip: 172.17.18.7
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41
+      interface: InfiniBand
+      ip: 172.18.18.7
+      ip6: fe80::230:48ff:ffcc:3d41
+      management: false
+      mountable: true
+      mounted: true
+      rate: 40000000000
+      version: MT26428
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2270000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2270000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: WDC WD2502ABYS-0
+      rev: 3.0
+      size: 251059544064
+      vendor: Western Digital
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
index 46c62e7ba7ad7486993528c9c59dcbf8808a99b5..a1aea7f031f1204fe5264ede92eaba9adf852b63 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.yaml
@@ -1,83 +1,84 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5f9e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.1
-      driver: mlx4_core
-      mountable: true
+    bmc:
+      ip: 172.17.17.1
+      mac: 08:00:38:36:af:df
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:be
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
       ip: 172.16.17.1
-      driver: igb
+      ip6: fe80::a00:38ff:fe36:f33a
+      mac: 08:00:38:36:f3:be
+      management: false
       mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:bf
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 08:00:38:36:f3:bf
+      management: false
       mountable: false
-    ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:9e
       interface: InfiniBand
+      ip: 172.18.17.1
+      ip6: fe80::a00:3800:137:5f9e
+      management: false
+      mountable: true
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
+      enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 08:00:38:36:af:df
-      ip: 172.17.17.1
+      mounted: false
+      rate: 10000000000
+      version: MT26428
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2270000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: C400-MTFDDAA128M
-      size: 128035676160
       rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
index 1429d7f31271b2726eba80ae314437adc1915c12..2c914c552d1ca8ae5277f2e9105c656d43491b2e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-31:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  storage_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    bmc:
+      ip: 172.17.17.31
+      mac: 08:00:38:35:a5:9f
+    eth0:
+      driver: igb
+      enabled: true
+      interface: Ethernet
+      ip: 172.16.17.31
+      ip6: fe80::a00:38ff:fe35:af3e
+      mac: 08:00:38:35:af:3e
+      management: false
+      mountable: true
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ce:de
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:cede
+      rate: 1000000000
+    eth1:
+      driver: igb
+      enabled: false
+      interface: Ethernet
+      mac: 08:00:38:35:af:3f
       management: false
+      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ce:de
       interface: InfiniBand
-      version: MT26428
       ip: 172.18.17.31
-      driver: mlx4_core
+      ip6: fe80::a00:3800:135:cede
+      management: false
       mountable: true
+      mounted: true
+      rate: 40000000000
+      version: MT26428
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:af:3e
-      ip6: fe80::a00:38ff:fe35:af3e
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.31
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:af:3f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
       mountable: false
-    bmc:
-      mac: 08:00:38:35:a5:9f
-      ip: 172.17.17.31
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
     clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
index 1388e858cc68551ca2af011aab57c855c891114c..ce268611f0eefc02698d28a565e87fce6f43d156 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-33:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid:  20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:73
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca73
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.33
-      driver: mlx4_core
-      mountable: true
+    bmc:
+      ip: 172.17.17.33
+      mac: 08:00:38:35:a4:26
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:4c
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
       ip: 172.16.17.33
-      driver: igb
+      ip6: fe80::a00:38ff:fe36:f33a
+      mac: 08:00:38:35:ac:4c
+      management: false
       mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:4d
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 08:00:38:35:ac:4d
+      management: false
       mountable: false
-    ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:73
       interface: InfiniBand
+      ip: 172.18.17.33
+      ip6: fe80::a00:3800:135:ca73
+      management: false
+      mountable: true
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
+      enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:26
-      ip: 172.17.17.33
+      mounted: false
+      rate: 10000000000
+      version: MT26428
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2270000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: C400-MTFDDAA064M
-      size: 64023257088
       rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
index 25474bb37d2df7ae06f3ee1ea70afec74825ac2e..97d6c65e5d60ae4e6a4a2ad002c0afd607790037 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  storage_devices:
-    sda:
-      model: C400-MTFDDAA064M
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:2d:73
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:2d73
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.4
-      driver: mlx4_core
-      mountable: true
+    bmc:
+      ip: 172.17.17.4
+      mac: 08:00:38:36:9f:26
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:d2:4c
-      ip6: fe80::a00:38ff:fe36:d24c
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
       ip: 172.16.17.4
-      driver: igb
+      ip6: fe80::a00:38ff:fe36:d24c
+      mac: 08:00:38:36:d2:4c
+      management: false
       mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      mac: 08:00:38:36:d2:4d
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 08:00:38:36:d2:4d
+      management: false
       mountable: false
-    ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:2d:73
       interface: InfiniBand
+      ip: 172.18.17.4
+      ip6: fe80::a00:3800:137:2d73
+      management: false
+      mountable: true
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
+      enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 08:00:38:36:9f:26
-      ip: 172.17.17.4
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
     clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
index 8799a51783570e6dc17b67cc17ab34cc204ca715..92a156c94a5953f46e909f3d738d4f590bb404df 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-46:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  storage_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    bmc:
+      ip: 172.17.17.46
+      mac: 08:00:38:35:a3:a5
+    eth0:
+      driver: igb
+      enabled: true
+      interface: Ethernet
+      ip: 172.16.17.46
+      ip6: fe80::a00:38ff:fe35:ab4a
+      mac: 08:00:38:35:ab:4a
+      management: false
+      mountable: true
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:f0
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c8f0
+      rate: 1000000000
+    eth1:
+      driver: igb
+      enabled: false
+      interface: Ethernet
+      mac: 08:00:38:35:ab:4b
       management: false
+      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:f0
       interface: InfiniBand
-      version: MT26428
       ip: 172.18.17.46
-      driver: mlx4_core
+      ip6: fe80::a00:3800:135:c8f0
+      management: false
       mountable: true
+      mounted: true
+      rate: 40000000000
+      version: MT26428
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:4a
-      ip6: fe80::a00:38ff:fe35:ab4a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.46
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:4b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
       mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:a5
-      ip: 172.17.17.46
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
     clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
index f6ff07ab22b63599348d4532ac040f6cdb2c598c..9638511542132fdac4d0bb3d1bef720db3423ed3 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-54:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5ed8
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.54
-      driver: mlx4_core
-      mountable: true
+    bmc:
+      ip: 172.17.17.54
+      mac: 08:00:38:35:a4:1d
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:3a
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
       ip: 172.16.17.54
-      driver: igb
+      ip6: fe80::a00:38ff:fe36:f33a
+      mac: 08:00:38:35:ac:3a
+      management: false
       mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      mac: 08:00:38:35:ac:3b
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 08:00:38:35:ac:3b
+      management: false
       mountable: false
-    ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:d8
       interface: InfiniBand
+      ip: 172.18.17.54
+      ip6: fe80::a00:3800:137:5ed8
+      management: false
+      mountable: true
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
+      enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1d
-      ip: 172.17.17.54
+      mounted: false
+      rate: 10000000000
+      version: MT26428
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2270000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: C200-MTFDBAA060M
-      size: 60022480896
       rev: 5.0
+      size: 60022480896
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
index 175ab4ed516f5a9978142b025e8f7a692d069b58..9a6e825b4a3a5907237055011e8a184d849bf622 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-61:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    bmc:
+      ip: 172.17.17.61
+      mac: 08:00:38:35:a3:ae
+    eth0:
+      driver: igb
+      enabled: true
+      interface: Ethernet
+      ip: 172.16.17.61
+      ip6: fe80::a00:38ff:fe35:ab5c
+      mac: 08:00:38:35:ab:5c
+      management: false
+      mountable: true
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:0b
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c90b
+      rate: 1000000000
+    eth1:
+      driver: igb
+      enabled: false
+      interface: Ethernet
+      mac: 08:00:38:35:ab:5d
       management: false
+      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:0b
       interface: InfiniBand
-      version: MT26428
       ip: 172.18.17.61
-      driver: mlx4_core
+      ip6: fe80::a00:3800:135:c90b
+      management: false
       mountable: true
+      mounted: true
+      rate: 40000000000
+      version: MT26428
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:5c
-      ip6: fe80::a00:38ff:fe35:ab5c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.61
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:5d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
       mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ae
-      ip: 172.17.17.61
+      mounted: false
+      rate: 10000000000
+      version: MT26428
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2270000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: C400-MTFDDAA128M
-      size: 128035676160
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
index 9152b8dee4bd382d39a0013c3eb921ec72cbcb7f..78d5ac29e61fa8d695e59ecab168df9d91e5d9b1 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-63:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    bmc:
+      ip: 172.17.17.63
+      mac: 08:00:38:35:a3:d9
+    eth0:
+      driver: igb
+      enabled: true
+      interface: Ethernet
+      ip: 172.16.17.63
+      ip6: fe80::a00:38ff:fe35:abb2
+      mac: 08:00:38:35:ab:b2
+      management: false
+      mountable: true
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c98c
+      rate: 1000000000
+    eth1:
+      driver: igb
+      enabled: false
+      interface: Ethernet
+      mac: 08:00:38:35:ab:b3
       management: false
+      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:8c
       interface: InfiniBand
-      version: MT26428
       ip: 172.18.17.63
-      driver: mlx4_core
+      ip6: fe80::a00:3800:135:c98c
+      management: false
       mountable: true
+      mounted: true
+      rate: 40000000000
+      version: MT26428
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:b2
-      ip6: fe80::a00:38ff:fe35:abb2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.63
-      driver: igb
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 08:00:38:35:ab:b3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
       mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d9
-      ip: 172.17.17.63
+      mounted: false
+      rate: 10000000000
+      version: MT26428
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2270000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: C400-MTFDDAA128M
-      size: 128035676160
       rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    clock_speed: 2270000000
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
index fc9e02a057abc9e4fb910c03352826db5dfc72b0..a70b5a93ff898f321b7b4e6cb760289d042dfc1d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 edel-72:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 10/26/2011
     vendor: INSYDE
     version: Thurley.3.60.18.0037_BUILD_NCB_N00021
-  storage_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: '123456789'
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:cb
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5fcb
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.72
-      driver: mlx4_core
-      mountable: true
+    bmc:
+      ip: 172.17.17.72
+      mac: 08:00:38:36:af:ee
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:dc
-      ip6: fe80::a00:38ff:fe36:f3dc
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
       ip: 172.16.17.72
-      driver: igb
+      ip6: fe80::a00:38ff:fe36:f3dc
+      mac: 08:00:38:36:f3:dc
+      management: false
       mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      mac: 08:00:38:36:f3:dd
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 08:00:38:36:f3:dd
+      management: false
       mountable: false
-    ib1:
       mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
-      rate: 10000000000
-      management: false
-      enabled: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5f:cb
       interface: InfiniBand
+      ip: 172.18.17.72
+      ip6: fe80::a00:3800:137:5fcb
+      management: false
+      mountable: true
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
+      enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 08:00:38:36:af:ee
-      ip: 172.17.17.72
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
     clock_speed: 2270000000
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
index c2055cb7327e1e97c54047537a3132b2b3177523..96b90885967b4bf55443c6c55ea3d5737b833d54 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.yaml
@@ -1,85 +1,86 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 genepi-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  storage_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+  chassis:
+    manufacturer: Bull SAS
+    name: Novascale Universal
+    serial: XAN-SM5P-00196
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:31
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5731
+    bmc:
+      ip: 172.17.16.27
+      mac: 00:30:48:96:d3:1f
+    eth0:
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
+      mac: 00:30:48:7f:41:4e
       management: false
+      mountable: false
+      mounted: false
+      rate: 1000000000
+    eth1:
+      driver: e1000e
       enabled: true
+      interface: Ethernet
+      ip: 172.16.16.27
+      ip6: fe80::230:48ff:fe7f:414f
+      mac: 00:30:48:7f:41:4f
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:31
       interface: InfiniBand
-      version: MT26418
       ip: 172.18.16.27
-      driver: mlx4_core
+      ip6: fe80::202:c903:1:5731
+      management: false
       mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:32
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:57:32
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:4e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
       mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:4f
-      ip6: fe80::230:48ff:fe7f:414f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.27
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d3:1f
-      ip: 172.17.16.27
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
+    cache_l1i: 32768
     cache_l2: 6291456
     cache_l3: 0
-    vendor: Intel
+    clock_speed: 2500000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial: XAN-SM5P-00196
-    manufacturer: Bull SAS
-    name: Novascale Universal
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
+    vendor: Intel
+    version: E5420
+  storage_devices:
+    sda:
+      model: WDC WD1600YS-01S
+      rev: 6.0
+      size: 164696555520
+      vendor: Western Digital
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
index 7a51716740afd54a88f0706297bf933c127e4ef4..10a34a3f50792fa2b947bec24a1fd192574e6e9d 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.yaml
@@ -1,85 +1,86 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 genepi-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
+  chassis:
+    manufacturer: Bull SAS
+    name: Novascale Universal
+    serial: XAN-SM5S-00196
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:59
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5659
+    bmc:
+      ip: 172.17.16.28
+      mac: 00:30:48:96:d7:76
+    eth0:
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
+      mac: 00:30:48:7f:41:5e
       management: false
+      mountable: false
+      mounted: false
+      rate: 1000000000
+    eth1:
+      driver: e1000e
       enabled: true
+      interface: Ethernet
+      ip: 172.16.16.28
+      ip6: fe80::230:48ff:fe7f:415f
+      mac: 00:30:48:7f:41:5f
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:59
       interface: InfiniBand
-      version: MT26418
       ip: 172.18.16.28
-      driver: mlx4_core
+      ip6: fe80::202:c903:1:5659
+      management: false
       mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5a
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:5a
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
       mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:41:5f
-      ip6: fe80::230:48ff:fe7f:415f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.28
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d7:76
-      ip: 172.17.16.28
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
+    vendor: Intel
+    version: E5420
   storage_devices:
     sda:
       model: WDC WD1600YS-01S
-      size: 164696555520
       rev: 6.0
+      size: 164696555520
       vendor: Western Digital
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
-    cache_l2: 6291456
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial: XAN-SM5S-00196
-    manufacturer: Bull SAS
-    name: Novascale Universal
diff --git a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
index 0c12e59fbb99a473ce68061b15490538c53c4198..5a3cb04a6825fdfea23901f3fb3accf54122193b 100644
--- a/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.yaml
@@ -1,85 +1,86 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 genepi-34:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 04/30/2008
     vendor: Phoenix Technologies LTD
     version: 1.1a
-  storage_devices:
-    sda:
-      model: WDC WD1600YS-01S
-      size: 164696555520
-      rev: 6.0
-      vendor: Western Digital
+  chassis:
+    manufacturer: Bull SAS
+    name: Novascale Universal
+    serial: XAN-SM5S-00199
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:55
-      rate: 20000000000
-      ip6: fe80::202:c903:1:5655
+    bmc:
+      ip: 172.17.16.34
+      mac: 00:30:48:96:d2:dd
+    eth0:
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
+      mac: 00:30:48:7f:29:40
       management: false
+      mountable: false
+      mounted: false
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      enabled: true
+      interface: Ethernet
+      ip: 172.16.16.34
+      ip6: fe80::230:48ff:fe7f:415d
+      mac: 00:30:48:7f:29:41
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    ib0:
+      driver: mlx4_core
       enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:55
       interface: InfiniBand
-      version: MT26418
       ip: 172.18.16.34
-      driver: mlx4_core
+      ip6: fe80::202:c903:1:5655
+      management: false
       mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
     ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:56
-      rate: 10000000000
-      management: false
+      driver: mlx4_core
       enabled: false
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:56:56
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: false
-      rate: 1000000000
-      mac: 00:30:48:7f:29:40
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
       mountable: false
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:7f:29:41
-      ip6: fe80::230:48ff:fe7f:415d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.16.34
-      driver: e1000e
-      mountable: true
-    bmc:
-      mac: 00:30:48:96:d2:dd
-      ip: 172.17.16.34
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: ivt
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2500000000
-    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
-    version: E5420
+    cache_l1i: 32768
     cache_l2: 6291456
     cache_l3: 0
-    vendor: Intel
+    clock_speed: 2500000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  chassis:
-    serial: XAN-SM5S-00199
-    manufacturer: Bull SAS
-    name: Novascale Universal
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5420  @ 2.50GHz
+    vendor: Intel
+    version: E5420
+  storage_devices:
+    sda:
+      model: WDC WD1600YS-01S
+      rev: 6.0
+      size: 164696555520
+      vendor: Western Digital
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
index e1a9d2876579ec21db54a5a1db9f2d77e50bbf5c..d45370659986225f2acacf696e8f720a42d8999e 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.yaml
@@ -1,64 +1,65 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-13:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
+    version: 1.5.3
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 9RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.33.113
+      mac: 84:2b:2b:71:f1:26
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:71:f1:24
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
       ip: 172.16.33.13
-      driver: bnx2
+      ip6: fe80::862b:2bff:fe70:c621
+      mac: 84:2b:2b:71:f1:24
+      management: false
       mountable: true
-    eth1:
-      mounted: false
+      mounted: true
       rate: 1000000000
-      mac: 84:2b:2b:71:f1:25
-      ip6: fe80::862b:2bff:fe70:c622
-      management: false
+    eth1:
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
+      ip6: fe80::862b:2bff:fe70:c622
+      mac: 84:2b:2b:71:f1:25
+      management: false
       mountable: true
-    bmc:
-      mac: 84:2b:2b:71:f1:26
-      ip: 172.17.33.113
-  storage_devices:
-    sda:
-      model: PERC H700
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+      mounted: false
+      rate: 1000000000
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  chassis:
-    serial: 9RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 12582912
-    vendor: Intel
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+    vendor: Intel
+    version: E5620
+  storage_devices:
+    sda:
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
+      vendor: DELL
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
index 128139bd26e1e52002a09097ce987a9fd18245dc..e6c00e27e53125d839ab425cbda9b681bb9b07f7 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-23.yaml
@@ -1,45 +1,46 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-23:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:49:f2
-      ip6: fe80::260:ddff:fe47:49f2
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.123
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:80:f8
       management: false
-      interface: Ethernet
-      driver: e1000e
+      mounted: false
     eth1:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.34.23
+      mac: 00:30:48:7c:80:f9
+      management: false
       mounted: true
       rate: 1000000000
-      mac: 00:30:48:7c:80:f9
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: false
+      interface: Myrinet
+      ip: 172.18.47.123
+      ip6: fe80::260:ddff:fe47:49f2
+      mac: 00:60:dd:47:49:f2
       management: false
-      interface: Ethernet
-      driver: e1000e
-      ip: 172.16.34.23
+      mountable: true
+      mounted: true
+      rate: 10000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
index fda6b6ba4105a675c871f5b262d3cb8dc374e8cf..7cf8ab734bda891dd1a7a7fc998a2f7086d19ee5 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-33.yaml
@@ -1,45 +1,46 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-33:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:49:e0
-      ip6: fe80::260:ddff:fe47:49e0
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.133
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7a:56:32
       management: false
-      interface: Ethernet
-      driver: e1000e
+      mounted: false
     eth1:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.34.33
+      mac: 00:30:48:7a:56:33
+      management: false
       mounted: true
       rate: 1000000000
-      mac: 00:30:48:7a:56:33
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: false
+      interface: Myrinet
+      ip: 172.18.47.133
+      ip6: fe80::260:ddff:fe47:49e0
+      mac: 00:60:dd:47:49:e0
       management: false
-      interface: Ethernet
-      driver: e1000e
-      ip: 172.16.34.33
+      mountable: true
+      mounted: true
+      rate: 10000000000
   storage_devices:
     sda:
       model: ST3250620NS
-      size: 250059350016
       rev: 3.AEK
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
index a4ab6059eda3d8eaa970bd512550d19f003502b6..b5469a6b3670564ba753307a1c5ceaea6d6002f0 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-36.yaml
@@ -1,45 +1,46 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-36:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:49:b7
-      ip6: fe80::260:ddff:fe47:49b7
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.136
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7d:2d:04
       management: false
-      interface: Ethernet
-      driver: e1000e
+      mounted: false
     eth1:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.34.36
+      mac: 00:30:48:7d:2d:05
+      management: false
       mounted: true
       rate: 1000000000
-      mac: 00:30:48:7d:2d:05
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: false
+      interface: Myrinet
+      ip: 172.18.47.136
+      ip6: fe80::260:ddff:fe47:49b7
+      mac: 00:60:dd:47:49:b7
       management: false
-      interface: Ethernet
-      driver: e1000e
-      ip: 172.16.34.36
+      mountable: true
+      mounted: true
+      rate: 10000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
index d670515d041135ea5625e96a5cdacc7bd8b89f10..6bb444d3ce54f3fe05c178b7ee264956846c5489 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-46.yaml
@@ -1,45 +1,46 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-46:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.146
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:6f:82
       management: false
-      interface: Ethernet
-      driver: e1000e
+      mounted: false
     eth1:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.34.46
+      mac: 00:30:48:7c:6f:83
+      management: false
       mounted: true
       rate: 1000000000
-      mac: 00:30:48:7c:6f:83
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: false
+      interface: Myrinet
+      ip: 172.18.47.146
+      ip6: fe80::260:ddff:fe47:4bb6
+      mac: 00:60:dd:47:4b:b6
       management: false
-      interface: Ethernet
-      driver: e1000e
-      ip: 172.16.34.46
+      mountable: true
+      mounted: true
+      rate: 10000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
index d2dd792f3ad3ac30c7f739afdaea900c0fe5f11a..d829c124172c3ae74b94f040e0311b7662f44716 100644
--- a/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chinqchint/nodes/chinqchint-8.yaml
@@ -1,49 +1,50 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 chinqchint-8:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 6.0
     release_date: 09/10/2007
     vendor: Phoenix Technologies LTD
+    version: 6.0
+  chassis:
+    manufacturer: SGI.COM
+    name: AltixXE310
+    serial: X0004750
+  main_memory:
+    ram_size: 8393850880
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4b:b6
-      ip6: fe80::260:ddff:fe47:4bb6
-      management: false
-      enabled: false
-      interface: Myrinet
-      ip: 172.18.47.108
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: false
+      driver: e1000e
+      interface: Ethernet
       mac: 00:30:48:7c:3d:d6
       management: false
-      interface: Ethernet
-      driver: e1000e
+      mounted: false
     eth1:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.34.8
+      mac: 00:30:48:7c:3d:d7
+      management: false
       mounted: true
       rate: 1000000000
-      mac: 00:30:48:7c:3d:d7
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: false
+      interface: Myrinet
+      ip: 172.18.47.108
+      ip6: fe80::260:ddff:fe47:4bb6
+      mac: 00:60:dd:47:4b:b6
       management: false
-      interface: Ethernet
-      driver: e1000e
-      ip: 172.16.34.8
+      mountable: true
+      mounted: true
+      rate: 10000000000
   storage_devices:
     sda:
       model: Hitachi HDT72502
-      size: 250059350016
       rev: A7EA
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: X0004750
-    manufacturer: SGI.COM
-    name: AltixXE310
-  main_memory:
-    ram_size: 8393850880
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
index 69a2aa72ab6772417c8480b701423e641f1fa366..619cd1b8a069151e33aa07740bc49ac3c19b8d55 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-11.yaml
@@ -1,82 +1,83 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: MBB2147RC
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 2.7.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 30W883J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.176.11
+      mac: 00:1c:23:d3:57:59
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0f:46
-      ip6: fe80::219:b9ff:fef2:f46
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.176.11
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0f:48
+      ip6: fe80::219:b9ff:fef2:f46
+      mac: 00:19:b9:f2:0f:46
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.178.11
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:34:e1:27
-      ip6: fe80::21b:21ff:fe34:e127
+      mac: 00:19:b9:f2:0f:48
       management: false
+      mountable: true
+      mounted: false
+    eth2:
+      driver: ixgbe
       enabled: true
       interface: Ethernet
       ip: 172.16.179.11
-      driver: ixgbe
+      ip6: fe80::21b:21ff:fe34:e127
+      mac: 00:1b:21:34:e1:27
+      management: false
       mountable: true
-    eth3:
       mounted: false
-      mac: 00:1b:21:34:e1:26
-      management: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
       enabled: false
       interface: Ethernet
-      driver: ixgbe
+      mac: 00:1b:21:34:e1:26
+      management: false
       mountable: false
-    bmc:
-      ip: 172.17.176.11
-      mac: 00:1c:23:d3:57:59
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 30W883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
+    cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    vendor: Intel
+    clock_speed: 2000000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
+    vendor: Intel
+    version: L5335
+  storage_devices:
+    sda:
+      model: MBB2147RC
+      rev: D406
+      size: 146815733760
+      vendor: FUJITSU
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
index 2e1d4e0dba79e86762de12c2350c2e0661ffa50e..fb00a782e99f456f66bf478ff6fdb4a0bf9aaebd 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.yaml
@@ -1,82 +1,83 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: MBB2147RC
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
+    version: 2.7.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 3R2593J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.176.3
+      mac: 00:1c:23:d6:c3:0a
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:83
-      ip6: fe80::219:b9ff:fef2:e83
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.176.3
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f2:0e:85
+      ip6: fe80::219:b9ff:fef2:e83
+      mac: 00:19:b9:f2:0e:83
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.178.3
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3c:87:cb
-      ip6: fe80::21b:21ff:fe3c:87cb
+      mac: 00:19:b9:f2:0e:85
       management: false
+      mountable: true
+      mounted: false
+    eth2:
+      driver: ixgbe
       enabled: true
       interface: Ethernet
       ip: 172.16.179.3
-      driver: ixgbe
+      ip6: fe80::21b:21ff:fe3c:87cb
+      mac: 00:1b:21:3c:87:cb
+      management: false
       mountable: true
-    eth3:
       mounted: false
-      mac: 00:1b:21:3c:87:ca
-      management: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
       enabled: false
       interface: Ethernet
-      driver: ixgbe
+      mac: 00:1b:21:3c:87:ca
+      management: false
       mountable: false
-    bmc:
-      ip: 172.17.176.3
-      mac: 00:1c:23:d6:c3:0a
-  chassis:
-    serial: 3R2593J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
+    cache_l1i: 32768
     cache_l2: 4194304
     cache_l3: 0
-    vendor: Intel
+    clock_speed: 2000000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
+    vendor: Intel
+    version: L5335
+  storage_devices:
+    sda:
+      model: MBB2147RC
+      rev: D406
+      size: 146815733760
+      vendor: FUJITSU
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
index dac3bc1688b6e94746164db3fca05ab037a968e2..934bb3e7ad9e808d852bf2fa5bf728531ce58133 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.yaml
@@ -1,82 +1,83 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-9:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 2.7.0
     release_date: 10/30/2010
     vendor: Dell Inc.
+    version: 2.7.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 89N983J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.176.9
+      mac: 00:1c:23:d3:42:88
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f1:fc:49
-      ip6: fe80::219:b9ff:fef1:fc49
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.176.9
-    eth1:
-      mounted: false
-      mac: 00:19:b9:f1:fc:4b
+      ip6: fe80::219:b9ff:fef1:fc49
+      mac: 00:19:b9:f1:fc:49
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.178.9
-    eth2:
-      mounted: false
-      rate: 10000000000
-      mac: 00:1b:21:3d:14:31
-      ip6: fe80::21b:21ff:fe3d:1431
+      mac: 00:19:b9:f1:fc:4b
       management: false
+      mountable: true
+      mounted: false
+    eth2:
+      driver: ixgbe
       enabled: true
       interface: Ethernet
       ip: 172.16.179.9
-      driver: ixgbe
+      ip6: fe80::21b:21ff:fe3d:1431
+      mac: 00:1b:21:3d:14:31
+      management: false
       mountable: true
-    eth3:
       mounted: false
-      mac: 00:1b:21:3d:14:30
-      management: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
       enabled: false
       interface: Ethernet
-      driver: ixgbe
+      mac: 00:1b:21:3d:14:30
+      management: false
       mountable: false
-    bmc:
-      ip: 172.17.176.9
-      mac: 00:1c:23:d3:42:88
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 4194304
+    cache_l3: 0
+    clock_speed: 2000000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
+    vendor: Intel
+    version: L5335
   storage_devices:
     sda:
       model: ST9146802SS
-      size: 146815733760
       rev: S207
+      size: 146815733760
       vendor: SEAGATE
-  chassis:
-    serial: 89N983J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz
-    version: L5335
-    cache_l2: 4194304
-    cache_l3: 0
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index de754d987c19c219542d94058529a5d51cbb8678..527f8e9b063e558eb9b5de6321080ce364068c64 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052075175
+  main_memory:
+    ram_size: 2146435072
   network_adapters:
+    bmc:
+      ip: 172.17.49.10
+      mac: 00:09:3d:11:aa:e3
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:aa:e1
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.110
-    eth1:
-      mounted: true
-      switch_port: "1:10"
-      rate: 1000000000
-      mac: 00:09:3d:11:aa:e2
-      ip6: fe80::209:3dff:fe11:aae2
+      mac: 00:09:3d:11:aa:e1
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.10
-    bmc:
-      mac: 00:09:3d:11:aa:e3
-      ip: 172.17.49.10
+      ip6: fe80::209:3dff:fe11:aae2
+      mac: 00:09:3d:11:aa:e2
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:10'
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 1048576
+    cache_l3: 0
+    clock_speed: 2400000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
   storage_devices:
     sda:
       model: ST373207LC
-      size: 73407868928
       rev: 2
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052075175
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index 71ca44a3ac2f0424f0bc732b317aa398bf4836a6..0de0d23e49c03ce2ed36ba8d96deba8292c84cdd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-21:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.21
+      mac: 00:09:3d:12:85:72
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:85:70
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.121
-    eth1:
-      mounted: true
-      switch_port: "1:21"
-      rate: 1000000000
-      mac: 00:09:3d:12:85:71
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:85:70
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.21
-    bmc:
-      mac: 00:09:3d:12:85:72
-      ip: 172.17.49.21
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:85:71
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:21'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index d7e9dc40685aa17c8609c567e985ebc448053447..59efb085671d3293c1a848d40e570a5341995ff6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-25:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.25
+      mac: 00:09:3d:10:de:8f
     eth0:
-      mounted: false
-      mac: 00:09:3d:10:de:8d
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.125
-    eth1:
-      mounted: true
-      switch_port: "1:25"
-      rate: 1000000000
-      mac: 00:09:3d:10:de:8e
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:10:de:8d
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.25
-    bmc:
-      mac: 00:09:3d:10:de:8f
-      ip: 172.17.49.25
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:10:de:8e
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:25'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index c9ba20321610aade82665bdc0674b3ec22e750ef..fdd633c0851c403739fec4a5bc720079888a1102 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-26:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083140
+  main_memory:
+    ram_size: 2146435072
   network_adapters:
+    bmc:
+      ip: 172.17.49.26
+      mac: 00:09:3d:11:ce:23
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:ce:21
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.126
-    eth1:
-      mounted: true
-      switch_port: "1:26"
-      rate: 1000000000
-      mac: 00:09:3d:11:ce:22
-      ip6: fe80::209:3dff:fe11:ce22
+      mac: 00:09:3d:11:ce:21
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.26
-    bmc:
-      mac: 00:09:3d:11:ce:23
-      ip: 172.17.49.26
-  storage_devices:
-    sda:
-      model: MAT3073NC
-      size: 73543163904
-      rev: 104
+      ip6: fe80::209:3dff:fe11:ce22
+      mac: 00:09:3d:11:ce:22
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:26'
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  chassis:
-    serial: XG052083140
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  supported_job_types:
-    virtual: false
-  main_memory:
-    ram_size: 2146435072
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: MAT3073NC
+      rev: 104
+      size: 73543163904
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index eabcae0b5a7a8558ae78b022c9be92cd1cc9fd7b..b569116e1bce375a72c06465b18ba915fe8edac6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422324
+  main_memory:
+    ram_size: 2146435072
   network_adapters:
+    bmc:
+      ip: 172.17.49.28
+      mac: 00:09:3d:12:33:e7
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:33:e5
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.128
-    eth1:
-      mounted: true
-      switch_port: "1:28"
-      rate: 1000000000
-      mac: 00:09:3d:12:33:e6
-      ip6: fe80::209:3dff:fe12:33e6
+      mac: 00:09:3d:12:33:e5
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.28
-    bmc:
-      mac: 00:09:3d:12:33:e7
-      ip: 172.17.49.28
+      ip6: fe80::209:3dff:fe12:33e6
+      mac: 00:09:3d:12:33:e6
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:28'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 1048576
+    cache_l3: 0
+    clock_speed: 2400000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
   storage_devices:
     sda:
       model: ST373207LC
-      size: 73407868928
       rev: 2
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052422324
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index b4126257bd6d3e4a3b920671f228eb53df8e8a6c..b26ce257e51680b7de546601dacf54f9d64cb1b8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-35:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.35
+      mac: 00:09:3d:12:28:18
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:28:16
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.135
-    eth1:
-      mounted: true
-      switch_port: "1:35"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:17
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:28:16
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.35
-    bmc:
-      mac: 00:09:3d:12:28:18
-      ip: 172.17.49.35
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:28:17
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:35'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index 0df74dc365fb6efe2a8251e8ed58ee7360dadf20..3373d696ffa82651b1460cec7d8f17d3fbced653 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-36:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.36
+      mac: 00:09:3d:10:c7:bc
     eth0:
-      mounted: false
-      mac: 00:09:3d:10:c7:ba
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.136
-    eth1:
-      mounted: true
-      switch_port: "1:36"
-      rate: 1000000000
-      mac: 00:09:3d:10:c7:bb
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:10:c7:ba
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.36
-    bmc:
-      mac: 00:09:3d:10:c7:bc
-      ip: 172.17.49.36
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:10:c7:bb
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:36'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index c144b107301ed6c676e83a83c58936bc7bb85de6..473fbc4a36231a00338a72ca730d6346e0112a99 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-37:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052423605
+  main_memory:
+    ram_size: 2146435072
   network_adapters:
+    bmc:
+      ip: 172.17.49.37
+      mac: 00:09:3d:12:69:fa
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:69:f8
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.137
-    eth1:
-      mounted: true
-      switch_port: "1:37"
-      rate: 1000000000
-      mac: 00:09:3d:12:69:f9
-      ip6: fe80::209:3dff:fe12:69f9
+      mac: 00:09:3d:12:69:f8
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.37
-    bmc:
-      mac: 00:09:3d:12:69:fa
-      ip: 172.17.49.37
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052423605
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      ip6: fe80::209:3dff:fe12:69f9
+      mac: 00:09:3d:12:69:f9
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:37'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 2146435072
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index f5af778f4538b7d2ba0d1a2ef39b003bc5920bde..300e466ec5d0e8fbfb8869ddc58c5e0a4af58076 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-40:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.40
+      mac: 00:09:3d:11:5a:32
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:5a:30
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.140
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:11:5a:31
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:5a:30
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.40
-    bmc:
-      mac: 00:09:3d:11:5a:32
-      ip: 172.17.49.40
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:5a:31
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index ece2b5b0d5e283aaf506fef5f1a93e161059c865..7b648cc0801e79ab09479d3b0afcd7c79ce93c49 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-41:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.41
+      mac: 00:09:3d:12:6a:43
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:6a:41
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.141
-    eth1:
-      mounted: true
-      switch_port: "1:41"
-      rate: 1000000000
-      mac: 00:09:3d:12:6a:42
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:6a:41
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.41
-    bmc:
-      mac: 00:09:3d:12:6a:43
-      ip: 172.17.49.41
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:6a:42
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:41'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index 965577426cfd28894bc286e7cefb054dcae5c670..d1b08eef3811873f6324fcae50e859a95815f1dd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-60:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052310130
+  main_memory:
+    ram_size: 2146435072
   network_adapters:
+    bmc:
+      ip: 172.17.49.60
+      mac: 00:09:3d:12:6b:3d
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:6b:3b
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.160
-    eth1:
-      mounted: true
-      switch_port: "2:12"
-      rate: 1000000000
-      mac: 00:09:3d:12:6b:3c
-      ip6: fe80::209:3dff:fe12:6b3c
+      mac: 00:09:3d:12:6b:3b
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.60
-    bmc:
-      mac: 00:09:3d:12:6b:3d
-      ip: 172.17.49.60
+      ip6: fe80::209:3dff:fe12:6b3c
+      mac: 00:09:3d:12:6b:3c
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '2:12'
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 1048576
+    cache_l3: 0
+    clock_speed: 2400000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
   storage_devices:
     sda:
       model: ST373207LC
-      size: 73407868928
       rev: 2
-  chassis:
-    serial: XG052310130
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      size: 73407868928
   supported_job_types:
     virtual: false
-  main_memory:
-    ram_size: 2146435072
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index 80b1d32eeaa963485adffcb9b7552d5e44641237..cfbff48ee64507b9a12548ebf4bc07aa32b066b8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-62:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.62
+      mac: 00:09:3d:12:70:5c
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:70:5a
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.162
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:12:70:5b
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:70:5a
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.62
-    bmc:
-      mac: 00:09:3d:12:70:5c
-      ip: 172.17.49.62
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:70:5b
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index 59ba77c55f057ab502d720a53d4621d8994b8ddb..bfb82ca0a1991aae4f954c35448536d2e97d0aef 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-68:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.68
+      mac: 00:09:3d:12:27:fa
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:27:f8
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.168
-    eth1:
-      mounted: true
-      switch_port: "2:20"
-      rate: 1000000000
-      mac: 00:09:3d:12:27:f9
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:27:f8
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.68
-    bmc:
-      mac: 00:09:3d:12:27:fa
-      ip: 172.17.49.68
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:27:f9
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '2:20'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index 24a1d485ab7c70073e2fd1815e02e3607523f490..05dbf96d656a7207e28baaa5239ae1878090afd4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-70:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.70
+      mac: 00:09:3d:11:ea:2a
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:ea:28
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.170
-    eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:11:ea:29
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:ea:28
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.70
-    bmc:
-      mac: 00:09:3d:11:ea:2a
-      ip: 172.17.49.70
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:ea:29
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index bddd5aced3a351ea3378e4e00df8c42cced274cd..a7eb01b550edb5593d13aea055de205c51b5e2ad 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-73:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.73
+      mac: 
     eth0:
-      mounted: false
-      mac:
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.173
-    eth1:
-      mounted: true
-      switch_port: "2:25"
-      rate: 1000000000
-      mac:
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.73
-    bmc:
-      mac:
-      ip: 172.17.49.73
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '2:25'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index cd6a4d7e5e3b06b33969b06126a4075c490d3867..19b8d8ee80b5f4d91cb238ab59cf4ccd71e4a133 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-76:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.76
+      mac: 00:09:3d:11:c5:21
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:c5:1f
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.176
-    eth1:
-      mounted: true
-      switch_port: "2:28"
-      rate: 1000000000
-      mac: 00:09:3d:11:c5:20
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:c5:1f
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.76
-    bmc:
-      mac: 00:09:3d:11:c5:21
-      ip: 172.17.49.76
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:c5:20
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '2:28'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index 91c06c7dd356effdca2a136902a3831cefcc7adc..bdd1fa41f2f3851ade1fc989d7207775b7db48fd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-77:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: MAT3073NC
-      size: 73543163904
-      rev: 104.0
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG051642100
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.77
+      mac: 00:09:3d:11:c5:2d
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:c5:2b
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.177
-    eth1:
-      mounted: true
-      switch_port: "2:29"
-      rate: 1000000000
-      mac: 00:09:3d:11:c5:2c
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:c5:2b
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.77
-    bmc:
-      mac: 00:09:3d:11:c5:2d
-      ip: 172.17.49.77
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG051642100
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:11:c5:2c
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '2:29'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index 3d6d86fd3ed0748c1b316901b467ca3086303f9b..0437c0785ac6c884d0cccc2813f281dc86c656f3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-79:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083120
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.79
+      mac: 00:09:3d:11:cd:8d
     eth0:
-      mounted: false
-      mac: 00:09:3d:11:cd:8b
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.179
-    eth1:
-      mounted: true
-      switch_port: "2:31"
-      rate: 1000000000
-      mac: 00:09:3d:11:cd:8c
-      ip6: fe80::209:3dff:fe11:cd8c
+      mac: 00:09:3d:11:cd:8b
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.79
-    bmc:
-      mac: 00:09:3d:11:cd:8d
-      ip: 172.17.49.79
+      ip6: fe80::209:3dff:fe11:cd8c
+      mac: 00:09:3d:11:cd:8c
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '2:31'
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 1048576
+    cache_l3: 0
+    clock_speed: 2400000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
   storage_devices:
     sda:
       model: ST373207LC
-      size: 73407868928
       rev: 2
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052083120
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index 00bb567d45721eaf3b11b04889271a4d827cacb8..230c7e76759217f50fa86a310ca00a41e0297a69 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -1,63 +1,64 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-8:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: ST373207LC
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
+    bmc:
+      ip: 172.17.49.8
+      mac: 00:09:3d:12:6b:10
     eth0:
-      mounted: false
-      mac: 00:09:3d:12:6b:0e
-      management: false
+      driver: tg3
       enabled: false
       interface: Ethernet
-      driver: tg3
-      mountable: false
       ip: 172.16.49.108
-    eth1:
-      mounted: true
-      switch_port: "1:8"
-      rate: 1000000000
-      mac: 00:09:3d:12:6b:0f
-      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:6b:0e
       management: false
+      mountable: false
+      mounted: false
+    eth1:
+      driver: tg3
       enabled: true
       interface: Ethernet
-      driver: tg3
-      mountable: true
       ip: 172.16.49.8
-    bmc:
-      mac: 00:09:3d:12:6b:10
-      ip: 172.17.49.8
-  supported_job_types:
-    virtual: false
-  chassis:
-    serial: XG052083161
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  main_memory:
-    ram_size: 17179869184
+      ip6: fe80::209:3dff:fe11:9522
+      mac: 00:09:3d:12:6b:0f
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+      switch_port: '1:8'
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2400000000
-    other_description: AMD Opteron(tm) Processor 250
-    version: 250
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2400000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 250
+    vendor: AMD
+    version: 250
+  storage_devices:
+    sda:
+      model: ST373207LC
+      rev: 2
+      size: 73407868928
+  supported_job_types:
+    virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
index c2d43f9e532692c4b289e62952554d36b30a677f..15e1bfa68220f48c5676b0fb71b9af935a9b5bf6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -1,94 +1,95 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 2.5
     release_date: 01/22/2016
     vendor: Dell Inc.
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: 4HTHD5J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.48.10
+      mac: d4:be:d9:fb:50:b2
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/10
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:f0
-      ip6: fe80::a236:9fff:fe09:c2f0
-      management: false
+      driver: ixgbe
       enabled: true
       interface: Ethernet
-      driver: ixgbe
-      mountable: true
       ip: 172.16.48.10
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:f2
+      ip6: fe80::a236:9fff:fe09:c2f0
+      mac: a0:36:9f:09:c2:f0
       management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
+      switch_port: TenGigabitEthernet 0/10
+    eth1:
+      driver: ixgbe
       enabled: false
       interface: Ethernet
-      driver: ixgbe
+      mac: a0:36:9f:09:c2:f2
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: bc:30:5b:ee:f6:90
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ee:f6:90
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: bc:30:5b:ee:f6:91
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ee:f6:91
+      management: false
       mountable: false
-    eth4:
       mounted: false
-      mac: bc:30:5b:ee:f6:92
-      management: false
+    eth4:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ee:f6:92
+      management: false
       mountable: false
-    eth5:
       mounted: false
-      mac: bc:30:5b:ee:f6:93
-      management: false
+    eth5:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ee:f6:93
+      management: false
       mountable: false
-    bmc:
-      mac: d4:be:d9:fb:50:b2
-      ip: 172.17.48.10
-  storage_devices:
-    sda:
-      model: PERC H710
-      size: 598879502336
-      rev: 3.13
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  chassis:
-    serial: 4HTHD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    vendor: Intel
+    clock_speed: 2300000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
+    vendor: Intel
+    version: E5-2630
+  storage_devices:
+    sda:
+      model: PERC H710
+      rev: 3.13
+      size: 598879502336
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
index dd5c16bbda2cb936a13bac00015f4829b66f6ee5..0165ce00ca28309ed2b5bf5e21fd986b0fb9b677 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.yaml
@@ -1,94 +1,95 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 2.5
     release_date: 01/22/2016
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: PERC H710
-      size: 598879502336
-      rev: 3.13
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: DHTHD5J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.48.14
+      mac: d4:be:d9:f9:a3:4c
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/14
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:4c
-      ip6: fe80::a236:9fff:fe08:f84c
-      management: false
+      driver: ixgbe
       enabled: true
       interface: Ethernet
-      driver: ixgbe
-      mountable: true
       ip: 172.16.48.14
-    eth1:
-      mounted: false
-      mac: a0:36:9f:08:f8:4e
+      ip6: fe80::a236:9fff:fe08:f84c
+      mac: a0:36:9f:08:f8:4c
       management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
+      switch_port: TenGigabitEthernet 0/14
+    eth1:
+      driver: ixgbe
       enabled: false
       interface: Ethernet
-      driver: ixgbe
+      mac: a0:36:9f:08:f8:4e
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: bc:30:5b:ef:30:64
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:30:64
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: bc:30:5b:ef:30:65
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:30:65
+      management: false
       mountable: false
-    eth4:
       mounted: false
-      mac: bc:30:5b:ef:30:66
-      management: false
+    eth4:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:30:66
+      management: false
       mountable: false
-    eth5:
       mounted: false
-      mac: bc:30:5b:ef:30:67
-      management: false
+    eth5:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:30:67
+      management: false
       mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:4c
-      ip: 172.17.48.14
-  chassis:
-    serial: DHTHD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 15728640
-    vendor: Intel
+    clock_speed: 2300000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
+    vendor: Intel
+    version: E5-2630
+  storage_devices:
+    sda:
+      model: PERC H710
+      rev: 3.13
+      size: 598879502336
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
index a5a153caec8972b964306adc24e563b5d1f01da6..64983ecaff0af043463aa41f02e6e925691c5a15 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.yaml
@@ -1,94 +1,95 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 2.5
     release_date: 01/22/2016
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: 6HTHD5J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.48.2
+      mac: d4:be:d9:f9:a3:ea
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/2
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:60
-      ip6: fe80::a236:9fff:fe09:c260
-      management: false
+      driver: ixgbe
       enabled: true
       interface: Ethernet
-      driver: ixgbe
-      mountable: true
       ip: 172.16.48.2
-    eth1:
-      mounted: false
-      mac: a0:36:9f:09:c2:62
+      ip6: fe80::a236:9fff:fe09:c260
+      mac: a0:36:9f:09:c2:60
       management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
+      switch_port: TenGigabitEthernet 0/2
+    eth1:
+      driver: ixgbe
       enabled: false
       interface: Ethernet
-      driver: ixgbe
+      mac: a0:36:9f:09:c2:62
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: bc:30:5b:ef:21:bc 
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:21:bc
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: bc:30:5b:ef:21:bd
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:21:bd
+      management: false
       mountable: false
-    eth4:
       mounted: false
-      mac: bc:30:5b:ef:21:be 
-      management: false
+    eth4:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:21:be
+      management: false
       mountable: false
-    eth5:
       mounted: false
-      mac: bc:30:5b:ef:21:bf
-      management: false
+    eth5:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: bc:30:5b:ef:21:bf
+      management: false
       mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:ea
-      ip: 172.17.48.2
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 15728640
+    clock_speed: 2300000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
+    vendor: Intel
+    version: E5-2630
   storage_devices:
     sda:
       model: PERC H710
-      size: 598879502336
       rev: 3.13
-  chassis:
-    serial: 6HTHD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2300000000
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    version: E5-2630
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
index 5738c8b6ad741efc3062241c567fa4127d94b0ef..9ea1d2bb3886c9c322e16fe0228b179e1a03dc49 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-123:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390125
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9219
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.123
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.123
+      mac: 00:e0:81:d5:06:af
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:ac
-      ip6: fe80::2e0:81ff:fed5:6ac
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.123
+      ip6: fe80::2e0:81ff:fed5:6ac
+      mac: 00:e0:81:d5:06:ac
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:06:ad
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:06:ae
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:06:ae
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19
+      interface: InfiniBand
+      ip: 172.18.64.123
+      ip6: fe80::202:c903:b:9219
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1a
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:af
-      ip: 172.17.64.123
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390125
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
index 66fffc088c4e1b4c945174e699e059a4c849084d..79267ef27c9e4dad25aae2fea9dad78569b74f38 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-144:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390146
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f85b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.144
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.144
+      mac: 00:e0:81:d5:06:bb
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:b8
-      ip6: fe80::2e0:81ff:fed5:6b8
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.144
+      ip6: fe80::2e0:81ff:fed5:6b8
+      mac: 00:e0:81:d5:06:b8
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:06:b9
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:06:ba
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:06:ba
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b
+      interface: InfiniBand
+      ip: 172.18.64.144
+      ip6: fe80::202:c903:5:f85b
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5c
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:bb
-      ip: 172.17.64.144
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390146
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
index 9b676450ef266b718ee5020bccc04ddb73a8e30b..662fc0877006b7da5ca006a541be955f8a43ebbd 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-24:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390026
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92cd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.24
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ce
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.24
+      mac: 00:e0:81:d5:07:13
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:10
-      ip6: fe80::2e0:81ff:fed5:710
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.24
+      ip6: fe80::2e0:81ff:fed5:710
+      mac: 00:e0:81:d5:07:10
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:07:11
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:07:12
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:12
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd
+      interface: InfiniBand
+      ip: 172.18.64.24
+      ip6: fe80::202:c903:b:92cd
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ce
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:13
-      ip: 172.17.64.24
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
-    version: "8.2"
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2530000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
   storage_devices:
     sda:
       model: Hitachi HDS72103
-      size: 320072933376
       rev: A3EA
+      size: 320072933376
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390026
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
index 6c5b0ed33875696a5b744546f5a849b5232c0d35..8850a928adb0cbc0040ad20c694dd4b9d9906f4e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.yaml
@@ -1,94 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390030
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:928d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.28
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.28
+      mac: 00:e0:81:d5:07:f3
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:f0 
-      ip6: fe80::2e0:81ff:fed5:65c
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.28
+      ip6: fe80::2e0:81ff:fed5:65c
+      mac: 00:e0:81:d5:07:f0
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:07:f1
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:07:f2
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:f2
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d
+      interface: InfiniBand
+      ip: 172.18.64.28
+      ip6: fe80::202:c903:b:928d
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8e
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:f3  # according to the DHCP config
-      #mac: 00:e0:81:d5:06:5f
-      ip: 172.17.64.28
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390030
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
index 7180922270d51dd274278d23502746da532f9b3f..9f5fd81ffc6cf5b0be5a3cc050be70f7fd545bac 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 605634005
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9159
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.3
+      mac: 00:e0:81:d5:08:73
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:70
-      ip6: fe80::2e0:81ff:fed5:870
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.3
+      ip6: fe80::2e0:81ff:fed5:870
+      mac: 00:e0:81:d5:08:70
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:08:71
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:08:72
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:08:72
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59
+      interface: InfiniBand
+      ip: 172.18.64.3
+      ip6: fe80::202:c903:b:9159
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:73
-      ip: 172.17.64.3
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 605634005
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
index 01c5047497eb52a3a61fdc67ec0f610c4d4bff0f..d4cf32495535a79baf97bf9dd567c0d9766d820d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-39:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390041
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92c1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.39
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.39
+      mac: 00:e0:81:d5:07:df
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:dc
-      ip6: fe80::2e0:81ff:fed5:7dc
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.39
+      ip6: fe80::2e0:81ff:fed5:7dc
+      mac: 00:e0:81:d5:07:dc
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:07:dd
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:07:de
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:de
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c1
+      interface: InfiniBand
+      ip: 172.18.64.39
+      ip6: fe80::202:c903:b:92c1
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c2
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:df
-      ip: 172.17.64.39
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2530000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
   storage_devices:
     sda:
       model: Hitachi HDS72103
-      size: 320072933376
       rev: A3EA
+      size: 320072933376
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390041
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
index b3f99196e5b3b2c14ba6e4cc32fe577a108c4bc9..c4dffb1702d436adf4906ecceced852048b7d239 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-52:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390054
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92f9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.52
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.52
+      mac: 00:e0:81:d5:07:0f
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:0c
-      ip6: fe80::2e0:81ff:fed5:70c
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.52
+      ip6: fe80::2e0:81ff:fed5:70c
+      mac: 00:e0:81:d5:07:0c
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:07:0d
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:07:0e
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:0e
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9
+      interface: InfiniBand
+      ip: 172.18.64.52
+      ip6: fe80::202:c903:b:92f9
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fa
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:0f
-      ip: 172.17.64.52
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390054
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
index 8a084c5cb4e66521d734bd5eea9117460e7e8edb..ea94071a4d3f268b63690a5562d39f7b7a4d90f0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-94:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390096
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5c95
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.94
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.94
+      mac: 00:e0:81:d5:07:93
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:90
-      ip6: fe80::2e0:81ff:fed5:790
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.94
+      ip6: fe80::2e0:81ff:fed5:790
+      mac: 00:e0:81:d5:07:90
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:07:91
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:07:92
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:92
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95
+      interface: InfiniBand
+      ip: 172.18.64.94
+      ip6: fe80::202:c903:b:5c95
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:96
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:93
-      ip: 172.17.64.94
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2530000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
   storage_devices:
     sda:
       model: Hitachi HDS72103
-      size: 320072933376
       rev: A3EA
+      size: 320072933376
       vendor: Hitachi
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390096
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
index b94e9943e915b81824b391b37a456c476cbd065b..c53178f44f84f8d04f68442ac40c8983f491f853 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-96:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390098
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e9d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.96
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.96
+      mac: 00:e0:81:d5:08:37
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: '00:00:00:00:00:00' # retired node used as an opensm serv. Replaced mac address for avoiding dhcp problems # 00:E0:81:D5:08:34
-      ip6: fe80::2e0:81ff:fed5:834
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.96
+      ip6: fe80::2e0:81ff:fed5:834
+      mac: '00:00:00:00:00:00'
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:08:35
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:08:36
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:08:36
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9d
+      interface: InfiniBand
+      ip: 172.18.64.96
+      ip6: fe80::202:c903:b:5e9d
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9e
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:37
-      ip: 172.17.64.96
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390098
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
index 5a8fe4dd4baa8bcb433c4966ebe92b20d3bc8158..c65c734291d54922f695fd20fe991f885890b147 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.yaml
@@ -1,93 +1,94 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-98:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.01e
     release_date: 02/18/2011
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
-  storage_devices:
-    sda:
-      model: Hitachi HDS72103
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 1009390100
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e99
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.98
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
+    bmc:
+      ip: 172.17.64.98
+      mac: 00:e0:81:d5:07:d7
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:d4
-      ip6: fe80::2e0:81ff:fed5:7d4
-      management: false
+      driver: e1000e
       enabled: true
       interface: Ethernet
-      driver: e1000e
-      mountable: true
       ip: 172.16.64.98
+      ip6: fe80::2e0:81ff:fed5:7d4
+      mac: 00:e0:81:d5:07:d4
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      enabled: false
+      interface: Ethernet
       mac: 00:e0:81:d5:07:d5
       management: false
+      mountable: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
       enabled: false
       interface: Ethernet
-      driver: e1000e
+      mac: 00:e0:81:d5:07:d6
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:d6
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99
+      interface: InfiniBand
+      ip: 172.18.64.98
+      ip6: fe80::202:c903:b:5e99
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: e1000e
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9a
+      interface: InfiniBand
+      management: false
       mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:d7
-      ip: 172.17.64.98
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2530000000
-    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
-    version: X3440
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2530000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 1
-    platform_type: x86_64
-    smt_size: 4
-  chassis:
-    serial: 1009390100
-    manufacturer: TYAN
-    name: S5501
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X3440  @ 2.53GHz
+    vendor: Intel
+    version: X3440
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
index db087f327da826f42b2439ab6cab19cdecb26ed3..bf337b69945028a360fc3c0c328d4d653491dc9d 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.yaml
@@ -1,84 +1,85 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-16:
-  main_memory:
-    ram_size: 17179869184
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 812530021
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     bmc:
       ip: 172.17.65.16
       mac: 00:e0:81:4f:e2:d8
     eth0:
+      driver: e1000e
+      enabled: true
       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
+      management: false
       mountable: true
       mounted: true
-      management: false
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
-      mac: 00:e0:81:b2:bf:a1
       enabled: false
+      interface: Ethernet
+      mac: 00:e0:81:b2:bf:a1
+      management: false
       mountable: false
       mounted: false
-      management: false
     ib0:
+      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:3f
       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: 10000000000
-      version: MT26418
-      enabled: false
+      management: false
       mountable: false
       mounted: false
-      management: false
-    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: 10000000000
       version: MT26418
+    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
-      management: false
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
     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: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial: 812530021
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
index 00dbafed66133000fd9d4ec1d8279fc59c59c8ed..db280280e4a6234d45f43065a24975768df4a12b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.yaml
@@ -1,84 +1,85 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-26:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 812530031
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     bmc:
       ip: 172.17.65.26
       mac: 00:e0:81:4f:b5:da
     eth0:
+      driver: e1000e
+      enabled: true
       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
+      management: false
       mountable: true
       mounted: true
-      management: false
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
-      mac: 00:e0:81:b2:c1:c9
       enabled: false
+      interface: Ethernet
+      mac: 00:e0:81:b2:c1:c9
+      management: false
       mountable: false
       mounted: false
-      management: false
     ib0:
+      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:d3
       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: 10000000000
-      version: MT26418
-      enabled: false
+      management: false
       mountable: false
       mounted: false
-      management: false
-    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: 10000000000
       version: MT26418
+    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
-      management: false
-  supported_job_types:
-    virtual: ivt
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
+      rate: 10000000000
+      version: MT26418
   operating_system:
-    name: debian
     kernel: 3.16.0-4-amd64
-    version: "8.2"
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
+    name: debian
+    version: '8.2'
   processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
     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: 812530031
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
index 73282376b61353710224ed5f2b7ae9589b76312b..28c79a11115ebefa1d2123fe1aef574c00f7aa19 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.yaml
@@ -1,84 +1,85 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-27:
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
+    release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
     version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 812530032
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     bmc:
       ip: 172.17.65.27
       mac: 00:e0:81:4f:e2:cb
     eth0:
+      driver: e1000e
+      enabled: true
       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
+      management: false
       mountable: true
       mounted: true
-      management: false
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
-      mac: 00:e0:81:b2:c0:c5
       enabled: false
+      interface: Ethernet
+      mac: 00:e0:81:b2:c0:c5
+      management: false
       mountable: false
       mounted: false
-      management: false
     ib0:
+      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:1f
       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: 10000000000
-      version: MT26418
-      enabled: false
+      management: false
       mountable: false
       mounted: false
-      management: false
-    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: 10000000000
       version: MT26418
+    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
-      management: false
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
+      rate: 10000000000
+      version: MT26418
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
     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: 17179869184
-  chassis:
-    serial: 812530032
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+      vendor: Hitachi
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
index b132eda9edfef702671006c1ff12cf22b6927ce9..4ad42b96fec38bb3ca432daaa4a810a13b89ba0b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.yaml
@@ -1,84 +1,85 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 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
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 812530033
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     bmc:
       ip: 172.17.65.28
       mac: 00:e0:81:4f:ca:8d
     eth0:
+      driver: e1000e
+      enabled: true
       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
+      management: false
       mountable: true
       mounted: true
-      management: false
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
-      mac: 00:e0:81:b2:c0:5f
       enabled: false
+      interface: Ethernet
+      mac: 00:e0:81:b2:c0:5f
+      management: false
       mountable: false
       mounted: false
-      management: false
     ib0:
+      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:db
       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: 10000000000
-      version: MT26418
-      enabled: false
+      management: false
       mountable: false
       mounted: false
-      management: false
-    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: 10000000000
       version: MT26418
+    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
-      management: false
+      rate: 10000000000
+      version: MT26418
   operating_system:
-    name: debian
     kernel: 3.16.0-4-amd64
-    version: "8.2"
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
   storage_devices:
     sda:
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
+      size: 320072933376
       vendor: Hitachi
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial: 812530033
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
index 65d0598bde45abc192c2b37ed0172b77f6865f98..966d55e132ba1798c28ac2fdb3b39a2659a6c559 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-1:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:a4
-      ip: 172.16.66.1
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.1
+      mac: 00:e0:81:b1:c0:a4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:a5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:a5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
index 9cfc4f57c409e9a082774a15fa98b0c0b47b54f5..a32b758a45429650a5c466b9232d7a6d6cb08620 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-104:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:48
-      ip: 172.16.66.104
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.104
+      mac: 00:e0:81:b5:9c:48
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:49
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:9c:49
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
index f0a500a2ee225b438651209d5e9f2bf5c3ce29ab..d093e139497b2f805bacaa47481d490c7692b594 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-11:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:82
-      ip: 172.16.66.11
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.11
+      mac: 00:e0:81:b1:bf:82
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:83
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:bf:83
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
index 6c3ef4d6e3bfc79ad93bc0327a8342d7e0058c36..137532607c50cb337bd73649413cf2b92940a60b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-110:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:96
-      ip: 172.16.66.110
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.110
+      mac: 00:e0:81:b1:bf:96
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:97
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:bf:97
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
index 5b6a12bdda05da9566f50d99fc534f3f5fb86ce8..c19c92e24a0c8c8f90ad23386adef94bbdbc3656 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-114.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-114:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:22
-      ip: 172.16.66.114
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.114
+      mac: 00:e0:81:b1:c4:22
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:23
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:23
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
index 30484fd4bcd24c61896ac8c30e13ff0234196522..b5d4ccb5c56faff5673ca972af0608a1e7fab889 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-118.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-118:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:c4
-      ip: 172.16.66.118
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.118
+      mac: 00:e0:81:b1:c4:c4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:c5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:c5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
index 639ecb298122630b80455489158a7108e483f6c1..18a5139efaae7ac627a6b04d6073bccf9a3dc6d5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-119.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-119:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:8f:ca
-      ip: 172.16.66.119
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.119
+      mac: 00:e0:81:b5:8f:ca
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:8f:cb
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:8f:cb
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
index 8be4c3b18bc05e0979b50b937ea0428a30f5a35f..1401ff0a758515d9908830bfe51520babfa767f0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-12.yaml
@@ -1,57 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-12:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      #mac: 00:e0:81:b2:bf:d6
-      mac: 00:E0:81:B2:C2:42 # According to the DHCP config
-      ip: 172.16.66.12
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.12
+      mac: 00:E0:81:B2:C2:42
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
index 2d647897aa59e0bea2ece4907ea1363838ca63b4..bdca51b8e852b7054eb6af68c4e989e8f5a5608c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-120.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-120:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:8c
-      ip: 172.16.66.120
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.120
+      mac: 00:e0:81:b1:c4:8c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:8d
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:8d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
index 2c59dc936e4c0fd4a37b427e956a29ca39995e02..e8d5e2b7eac9205b02c7e41c2f4f87ead500870c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-122.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-122:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c3:d4
-      ip: 172.16.66.122
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.122
+      mac: 00:e0:81:b1:c3:d4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c3:d5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c3:d5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
index c13003e220446a72f7b1e43673aa58e12f3b120e..30c3f7561b782d2f1b1f5b210738eee63643c63b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-123.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-123:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:d6
-      ip: 172.16.66.123
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.123
+      mac: 00:e0:81:b1:bf:d6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:d7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:bf:d7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
index 46eda3d6eea89bf64ebfca26df0b64c7a78fcaf2..02982819320b14d4c864f60a181fc79795d99c60 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-125.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-125:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:72
-      ip: 172.16.66.125
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.125
+      mac: 00:e0:81:b1:c0:72
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:73
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:73
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
index ffb744970cfc0a141aa48619b3b09f1cb9e705bf..1162b2f1ec732d01d7dd6b1f9ee249c3dedee1ed 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-127.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-127:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:6e
-      ip: 172.16.66.127
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.127
+      mac: 00:e0:81:b1:c4:6e
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:6f
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:6f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
index 446560d4b226bc53bdf41d3d0ef51470d2e61d5e..d7981c96fb26c4faa1dbf0d7e356a29c56e4d5ed 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-128.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-128:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:6e
-      ip: 172.16.66.128
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.128
+      mac: 00:e0:81:b1:c0:6e
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:6f
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:6f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
index c0a30b1bb58269e6fcf8a572e06b63d6aa348b82..676ede6c24145964d9d22dd76d4ae0926e4db5b6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-129.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-129:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:74
-      ip: 172.16.66.129
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.129
+      mac: 00:e0:81:b1:c4:74
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:75
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:75
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
index a5e629c7d9fe669258f93426d346f156e8f83bec..9c2a6b5f532ea9c64556b035765b9b847800487e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-130.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-130:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:72
-      ip: 172.16.66.130
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.130
+      mac: 00:e0:81:b1:c4:72
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:73
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:73
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
index 42fccef50b4cb5417919f3ebd0eb2e944ae3aef3..cc642186de24dc5d958b9c0f7c09b51fa68363e5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-131.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-131:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:6c
-      ip: 172.16.66.131
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.131
+      mac: 00:e0:81:b1:c4:6c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:6d
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:6d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
index 9cc6771eff8aa58e86929fb03578c30539110e69..b5e92d96e5a899bd967a405bb37b7328023ebbd1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-132.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-132:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:26
-      ip: 172.16.66.132
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.132
+      mac: 00:e0:81:b1:c0:26
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:27
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:27
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
index b849621c122a830ec990634472c279cf86d9e977..97b19ec572ceb4d7e033b23cc93e5e1daec93e74 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-134.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-134:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:aa
-      ip: 172.16.66.134
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.134
+      mac: 00:e0:81:b2:c0:aa
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:ab
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:ab
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
index aed7eaf5e04def1471d0d46df75e5c1c6c6cdde0..52cabb985f38870a51ced370a2058200c85c0bab 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-20.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-20:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:90
-      ip: 172.16.66.20
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.20
+      mac: 00:e0:81:b2:c0:90
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:91
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:91
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
index 2790997f0cc37a2feb162988f117676122badf25..78c5452cca9275a2d71f623ee4d1712704286d29 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-22.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-22:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:86
-      ip: 172.16.66.22
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.22
+      mac: 00:e0:81:b2:c0:86
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:87
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:87
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
index df55da4e756914d8a0c787c820d86a74f434df96..4fcac4ceff565014cc0b4cbc5ee8081a21142827 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-25.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-25:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:b6
-      ip: 172.16.66.25
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.25
+      mac: 00:e0:81:b2:c4:b6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:b7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:b7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
index d2ca261252402e42e3537e221b0402f483dd39f5..37b3d05d03f4c8f00cb23c61e7bfcfe86bb9f1da 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-30.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-30:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b7:8b:3a
-      ip: 172.16.66.30
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.30
+      mac: 00:e0:81:b7:8b:3a
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b7:8b:3b
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b7:8b:3b
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
index 01cac3ca932f5cc116850aa4bdf1f1991fc7a29a..3b7b27c0d8dba51af4954720fdc7d7fb89102d1e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-38.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-38:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:46
-      ip: 172.16.66.38
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.38
+      mac: 00:e0:81:b2:c2:46
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:47
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:47
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
index 093141d3974139da33c49cf0780424fad32c6a80..69d84c3ee234867c7eff23f657304e351637d8ef 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-39.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-39:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:10
-      ip: 172.16.66.39
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.39
+      mac: 00:e0:81:b2:c0:10
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:11
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:11
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
index d8b048096a6aa6ca48d93c47de2b52ff7c830336..f1a9bb2635fd204f0a87f2b6e6def5d7dab7daa0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-40.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-40:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72503
-      rev: V54O
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d8
-      ip: 172.16.66.40
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.40
+      mac: 00:e0:81:b2:bf:d8
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d9
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d9
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72503
+      rev: V54O
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
index add942ede4a105db9c87e5fa7288457d92696885..c742aed629add615fc9c26be1d8c5cc21fb2d01f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-41.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-41:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:22
-      ip: 172.16.66.41
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.41
+      mac: 00:e0:81:b2:c1:22
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:23
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:23
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
index bc0bbd74456cd3469b1c3fd905e0b0de48d2191b..2c7c9bb7417764e08d0cf7fed8b89053dadd525c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-42.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-42:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:2e
-      ip: 172.16.66.42
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.42
+      mac: 00:e0:81:b2:c1:2e
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:2f
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:2f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
index d817e500ebe16218b9773d156b9894563351d9db..77d46a65b5fb9c31837336fcfba8cd4d8103670d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-43.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-43:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:b0
-      ip: 172.16.66.43
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.43
+      mac: 00:e0:81:b2:c1:b0
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:b1
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:b1
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
index 67419fb4ddd8801529c576a3cc6337bec8028ad2..a0d8e1a9a112bb085fdc14eac68733cb835f10bb 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-44.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-44:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:74
-      ip: 172.16.66.44
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.44
+      mac: 00:e0:81:b2:c2:74
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:75
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:75
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
index f3b4300ebc177de469ded5cdd4e9e5dbc9cb64f2..cc7745dbf9df5dee09baf5bca45d338e38fbad79 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-49.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-49:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:a4
-      ip: 172.16.66.49
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.49
+      mac: 00:e0:81:b2:c4:a4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:a5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:a5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
index 0f58cbda2012e56e35863bf640c7e7a462addf70..6c8b33f41fd5b50684216a59816fdd12c3284797 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-50.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-50:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:6c
-      ip: 172.16.66.50
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.50
+      mac: 00:e0:81:b2:c5:6c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:6d
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:6d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
index 658a867e831dbe2393fcbae7760b905551236175..806741dc5f240fa2e5c65c78665eae1fbe803054 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-51.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-51:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:76
-      ip: 172.16.66.51
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.51
+      mac: 00:e0:81:b2:c1:76
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:77
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:77
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
index f858557ba671f7eb77a93d43389e9623a72d15c9..cf90fed74781d233ab0bbef2cb464ef0b35e4a17 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-52.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-52:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:80
-      ip: 172.16.66.52
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.52
+      mac: 00:e0:81:b2:c1:80
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:81
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:81
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
index 4ab3819c3f2d1f8d64fdcf729f073b1064e2bde1..189980075407a5091d3e90166e4e097fe2338d4f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-53.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-53:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:f4
-      ip: 172.16.66.53
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.53
+      mac: 00:e0:81:b1:bf:f4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:f5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:bf:f5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
index 9f09fff397ae7a4811a9418735dcc0984b18e6f3..5341717b472bcc0053324fe4a78923696d48c0bd 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-54.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-54:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:98
-      ip: 172.16.66.54
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.54
+      mac: 00:e0:81:b2:c1:98
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:99
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:99
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
index 4ef949ada245f7eb2ede081a0dd57c035390842b..486392dd9cc1fdb1613fbe8ba775c76c548a16ec 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-55.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-55:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:8c
-      ip: 172.16.66.55
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.55
+      mac: 00:e0:81:b2:c1:8c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:8d
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:8d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
index 6c42b5278144adccdd823f43f81416bf1f8a27fe..380f332bcbd3b18685195bc6b0f96532dbde71b7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-56.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-56:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d0
-      ip: 172.16.66.56
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.56
+      mac: 00:e0:81:b2:bf:d0
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d1
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d1
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
index 3a2cc67daa1f551caabd9cdcf9cd3ab39f356483..16783f5e839efe1868a2549f845cd2d391753222 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-57.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-57:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:d6
-      ip: 172.16.66.57
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.57
+      mac: 00:e0:81:b2:bf:d6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
index f6512c115996df9cb383c1a0b74b1442e2ec4089..c5f2e7a348135b065ac9d567945d1424ac7037e9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-58.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-58:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:9c
-      ip: 172.16.66.58
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.58
+      mac: 00:e0:81:b2:c4:9c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:9d
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:9d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
index fd3fd5c9a44676f00a886aaa1995fd3706a37c30..cad9fd73ac874dcb005b3065263684e1164e1cf1 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-59.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-59:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:32
-      ip: 172.16.66.59
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.59
+      mac: 00:e0:81:b2:c2:32
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:33
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:33
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
index 3334f314c9e7580393ef5d569ab55cc6e91d6234..48bdb71a14df6152473006e971f036957076dfbd 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-7.yaml
@@ -1,57 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-7:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      #mac: 00:e0:81:b2:bf:d6
-      mac: 00:E0:81:B2:C1:EC
-      ip: 172.16.66.7
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.7
+      mac: 00:E0:81:B2:C1:EC
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
index ba9333673b8094237d996e49471f404ba066110c..c724528300048cfc4ce3c709d5afa57c7bf01b9b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-75.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-75:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:96
-      ip: 172.16.66.75
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.75
+      mac: 00:e0:81:b2:c0:96
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:97
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:97
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
index e2358c3e37b353d94caf27c5a3b324b4b083c6e0..99dc854ff581f43119eaf5ba21f77f21e1c5e96c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-76.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-76:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:e8
-      ip: 172.16.66.76
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.76
+      mac: 00:e0:81:b2:c1:e8
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:e9
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:e9
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
index b7a7432ef23bf37eff8b13a75d0620acc76f6ed6..24c35e3c73acf0a68ae6d729c71fa061f9fe8ac6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-77.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-77:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:8f:b6
-      ip: 172.16.66.77
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.77
+      mac: 00:e0:81:b5:8f:b6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:8f:b7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:8f:b7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
index 9b9b9bc74f76b350808de8d81310f83d46bb09bf..2b29598d0bcdbe08ba7e8e3cc3ac50a5a7c085a3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-78.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-78:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:76
-      ip: 172.16.66.78
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.78
+      mac: 00:e0:81:b2:c2:76
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:77
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:77
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
index e8e288398f8da74559abd7ba9476f30d00db3fa3..03a7cccd1e1e037bf1cadc073ddb111765c4001d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-79.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-79:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:a2
-      ip: 172.16.66.79
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.79
+      mac: 00:e0:81:b2:c1:a2
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:a3
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:a3
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
index 81801b4b9ac52fd3f8cd2fa6099f44fb5f797b6a..83d75f270e2a4ffaa6f64b207963ea5040a1a8e6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-80.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-80:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:54
-      ip: 172.16.66.80
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.80
+      mac: 00:e0:81:b2:c0:54
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:55
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:55
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
index 4363e6a3d663fc46e63b51cefcefb26832c63514..80266ab1d10b40e5a34e69770e935d34287d5914 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-82.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-82:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:0e
-      ip: 172.16.66.82
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.82
+      mac: 00:e0:81:b2:c0:0e
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:0f
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:0f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
index ab2ebeef3ce8c2467f7fa953af371802df301451..7a5831facaf76d8213e115e566cfee6c03581250 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-83.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-83:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:E0:81:B2:BF:DA #00:e0:81:b2:bf:d6
-      ip: 172.16.66.83
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.83
+      mac: 00:E0:81:B2:BF:DA
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
index 5f55ed9f92e718d64498678b4cbeff657adc962f..09712b879976c7a616ff1efaa4298ec102955dd3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-85.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-85:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:b2
-      ip: 172.16.66.85
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.85
+      mac: 00:e0:81:b2:c4:b2
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:b3
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:b3
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
index f56de2e736857e089863ae09f1ca6ebb1dbdb6f3..1126ba0ce517383109174501a7e6d0cf0573a31e 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-87.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-87:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ae
-      ip: 172.16.66.87
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.87
+      mac: 00:e0:81:b2:c1:ae
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:af
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:af
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
index b57471d466d98ae8cdc315acded03888fece722d..b3ce0c40220555737fcd12e2a3c782cecaae9f54 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-88.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-88:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:56
-      ip: 172.16.66.88
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.88
+      mac: 00:e0:81:b2:c0:56
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:57
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:57
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
index 6fbaf8640cfbf6d5c4590c4319d0f0bc061dea74..7f22f7765c13aa41baeb5cc926083794e96f15c3 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-89.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-89:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:2c
-      ip: 172.16.66.89
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.89
+      mac: 00:e0:81:b2:c1:2c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:2d
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:2d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
index 637c610bfdd6dcf39291afada5543b9743956aad..d34f51e4a87ab56961dbf1b12acfb9c0fea1f98f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-90.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-90:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:e6
-      ip: 172.16.66.90
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.90
+      mac: 00:e0:81:b1:c0:e6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:e7
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:e7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
index 07e90a66aca6b0f8ed5b51cb09737392181e635f..a0c5b98ec29bc017bcbf5022ee3e9f19a4208639 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-91.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-91:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:f0
-      ip: 172.16.66.91
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.91
+      mac: 00:e0:81:b1:c0:f0
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:f1
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:f1
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
index 4fa667fff86a5bfedb9f65132f34daa35fd785d0..8b9ac1cf2a539c4e71297002f31e811a432568aa 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-92.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-92:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:d4
-      ip: 172.16.66.92
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.92
+      mac: 00:e0:81:b1:c0:d4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:d5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:d5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
index 0c278541e50339a587f53e3f17371622d547edd3..78cc85998683ad9b0818d9efe563a46b6dff2120 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-94.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-94:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 15032385536
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9b:b4
-      ip: 172.16.66.94
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.94
+      mac: 00:e0:81:b5:9b:b4
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9b:b5
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:9b:b5
       management: false
-  main_memory:
-    ram_size: 15032385536
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
index 52ce975d3c701ea369963783a3a423363f0bda43..8ce8af4a0b9ed4e421c2b8361324dcad1328ee2c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-96.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-96:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:16
-      ip: 172.16.66.96
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.96
+      mac: 00:e0:81:b5:9c:16
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:17
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:9c:17
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
index e8fd35d69d32100e62b0374466ea867c745079e7..cb60204b07e1ca43df4f840182548904d0fb648a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-97.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-97:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:9c:a2
-      ip: 172.16.66.97
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.97
+      mac: 00:e0:81:b5:9c:a2
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:a3
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:9c:a3
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
index 7a21b64f94e121a164088bb7d63e70f7ccdea6c2..0d55fd8051435c1d8080e5873f216324c2be106b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-98.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-98:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:98
-      ip: 172.16.66.98
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.98
+      mac: 00:e0:81:b5:56:98
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:99
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:56:99
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
index 47309d847ecb07efd96aaecfb28925fddce22970..224411da49e454c80710cbf8b2aa55c99720bb07 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-99.yaml
@@ -1,56 +1,57 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 talc-99:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-    name: debian
-  processor:
-    cache_l1i: 32768
-    cache_l1d: 32768
-    clock_speed: 2500000000
-    vendor: Intel
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    version: L5420
-    cache_l2: 6291456
-    cache_l3: 0
-    instruction_set: x86-64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:94
-      ip: 172.16.66.99
-      mountable: true
       driver: e1000e
+      enabled: true
       interface: Ethernet
+      ip: 172.16.66.99
+      mac: 00:e0:81:b5:56:94
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:95
-      mountable: false
       driver: e1000e
+      enabled: false
       interface: Ethernet
+      mac: 00:e0:81:b5:56:95
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mountable: false
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 6291456
+    cache_l3: 0
+    clock_speed: 2500000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
+    vendor: Intel
+    version: L5420
+  storage_devices:
+    sda:
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
index 54731919339b9b89bff74acc51d60666e77ab6ec..871c00061e8376f8402bec69df97f683a7f65844 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.yaml
@@ -1,77 +1,78 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-22:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390WL
+  main_memory:
+    ram_size: 49392123904
   network_adapters:
+    bmc:
+      ip: 172.17.160.22
+      mac: 1c:c1:de:7b:36:3e
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:f5:74
-      ip6: fe80::d685:64ff:fe45:f574
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.160.22
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:f5:75
+      ip6: fe80::d685:64ff:fe45:f574
+      mac: d4:85:64:45:f5:74
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:f5:75
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: d4:85:64:45:f5:72
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:f5:72
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d4:85:64:45:f5:73
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:f5:73
+      management: false
       mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:3e
-      ip: 172.17.160.22
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: GB804390WL
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
index 29ddc3ef1f9fe140bea533babcc48e4f918a515e..2bb64d61d2a3d1b2aeebe643b23d744d552cd99d 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.yaml
@@ -1,77 +1,78 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-30:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB80439102
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
+    bmc:
+      ip: 172.17.160.30
+      mac: 1c:c1:de:7b:16:fd
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:b6
-      ip6: fe80::d685:64ff:fe45:c5b6
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.160.30
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:c5:b7
+      ip6: fe80::d685:64ff:fe45:c5b6
+      mac: d4:85:64:45:c5:b6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:c5:b7
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: d4:85:64:45:c5:be
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:c5:be
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d4:85:64:45:c5:bf
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:c5:bf
+      management: false
       mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:fd
-      ip: 172.17.160.30
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: GB0250EAFYK
-      size: 250059350016
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB80439102
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
index 5cfbfdc8d65c70a4a464a0f80f6df84a96312867..df5ce6174d3e18472df9b2f8769f285199905e2f 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.yaml
@@ -1,77 +1,78 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-37:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804391BD
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
+    bmc:
+      ip: 172.17.160.37
+      mac: 1c:c1:de:7b:26:4b
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:42
-      ip6: fe80::d685:64ff:fe45:d542
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.160.37
-    eth1:
-      mounted: false
-      mac: d4:85:64:45:d5:43
+      ip6: fe80::d685:64ff:fe45:d542
+      mac: d4:85:64:45:d5:42
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:d5:43
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: d4:85:64:45:d5:7c
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:d5:7c
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d4:85:64:45:d5:7d
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d4:85:64:45:d5:7d
+      management: false
       mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:4b
-      ip: 172.17.160.37
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      size: 250059350016
-      rev: HPG2
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: GB804391BD
-    manufacturer: HP
-    name: ProLiant DL165 G7
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
index 321822c0b8cff2cb1e3dbb882fb0c13849bb21bd..4a488271a291c34fa0fcbaeea65202ad0cd388a1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.yaml
@@ -1,77 +1,78 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-38:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB80439141
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
+    bmc:
+      ip: 172.17.160.38
+      mac: 1c:c1:de:7a:02:3f
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:6e:14:e6
-      ip6: fe80::1ec1:deff:fe6e:14e6
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.160.38
-    eth1:
-      mounted: false
-      mac: 1c:c1:de:6e:14:e7
+      ip6: fe80::1ec1:deff:fe6e:14e6
+      mac: 1c:c1:de:6e:14:e6
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 1c:c1:de:6e:14:e7
+      management: false
       mountable: false
-    eth2:
       mounted: false
-      mac: 1c:c1:de:6e:14:ec
-      management: false
+    eth2:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 1c:c1:de:6e:14:ec
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 1c:c1:de:6e:14:ed
-      management: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 1c:c1:de:6e:14:ed
+      management: false
       mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:02:3f
-      ip: 172.17.160.38
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: GB0250EAFYK
-      size: 250059350016
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB80439141
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
index 2b70e5400a81e171edb3dbb03455193a2c539153..507170a779b6a24be6869dfc8b48f59f01fc539e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.yaml
@@ -1,80 +1,81 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
+    version: '1.14'
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF054
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:11
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9511
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:12
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 00:14:4f:ca:99:be
       ip: 172.17.98.14
+      mac: 00:14:4f:ca:99:be
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:bc
-      ip6: fe80::214:4fff:feca:99bc
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.98.14
+      ip6: fe80::214:4fff:feca:99bc
+      mac: 00:14:4f:ca:99:bc
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 00:14:4f:ca:99:bd
       management: false
+      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:11
+      interface: InfiniBand
+      ip: 172.18.98.14
+      ip6: fe80::203:ba00:100:9511
+      management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:95:12
+      interface: InfiniBand
+      management: false
       mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 0935XEF054
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  main_memory:
-    ram_size: 25769803776
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2930000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
+    vendor: Intel
+    version: X5570
   storage_devices:
     sda:
       model: HITACHI HUA7250S
-      size: 500107862016
       rev: AC5A
+      size: 500107862016
       vendor: ATA
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
index 7b2c1eacd195cb9a1c9074a7ac1877937fed759c..e08a9bbe4564c596e0c98f2c10444ec17cfdbb69 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.yaml
@@ -1,79 +1,80 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-22:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
+    version: '1.14'
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF043
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e1
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:6739
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.22
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 00:14:4f:ca:8e:f6
       ip: 172.17.98.22
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 00:14:4f:ca:8e:f6
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:8e:f4
-      ip6: fe80::221:28ff:fe40:3c3a
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.98.22
+      ip6: fe80::221:28ff:fe40:3c3a
+      mac: 00:14:4f:ca:8e:f4
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 00:14:4f:ca:8e:f5
       management: false
+      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e1
+      interface: InfiniBand
+      ip: 172.18.98.22
+      ip6: fe80::203:ba00:100:6739
+      management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e2
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2930000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
+    vendor: Intel
+    version: X5570
   storage_devices:
     sda:
       model: HITACHI HUA7250S
-      size: 500107862016
       rev: AC5A
-  chassis:
-    serial: 0935XEF043
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
+      size: 500107862016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2930000000
-    other_description: Intel(R) Xeon(R) CPU           X5570  @ 2.93GHz
-    version: X5570
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
index 1be4a770371db298e77b506e37b24fe98003d5b9..45ccd0fe09dae0d0a5000bcd858f4ac776717210 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651KK
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1b
-      rate: 20000000000
-      ip6: fe80::202:c903:6:ba1b
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.10
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:58:23:f2
       ip: 172.17.99.10
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1c
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:58:23:f2
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:88
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:a5:88
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:89
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.10
+      ip6: fe80::7ae7:d1ff:fef5:fe99
+      mac: d8:d3:85:e6:a5:89
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:98
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:a5:99
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d8:d3:85:e6:a5:99
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1b
+      interface: InfiniBand
+      ip: 172.18.99.10
+      ip6: fe80::202:c903:6:ba1b
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:1c
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: GB0250EAFYK
-      size: 250059350016
       rev: HPG2
+      size: 250059350016
       vendor: ATA
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651KK
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
index 5c73dcd4edc0f95c8ea329ff1c7cfb3079e3fd40..13913a7ca5096abe3a6bdc6e090ca2b5f79c10c5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651JY
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:65
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7365
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.14
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:66
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:58:33:67
       ip: 172.17.99.14
+      mac: 78:e7:d1:58:33:67
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:5d:0c:3e
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:5d:0c:3e
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:5d:0c:3f
-      ip6: fe80::7ae7:d1ff:fe5d:c3f
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.14
+      ip6: fe80::7ae7:d1ff:fe5d:c3f
+      mac: 78:e7:d1:5d:0c:3f
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:5d:0c:18
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:5d:0c:19
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:5d:0c:19
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:65
+      interface: InfiniBand
+      ip: 172.18.99.14
+      ip6: fe80::223:7dff:ff94:7365
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:66
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651JY
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
index 1548b4ce106ef84f30c38ce4dd146e9f12065f73..8c10a05088b473db04c70f380ae17b3ed576b53e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-17:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651JT
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:31
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7331
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.17
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:32
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:c9:1b
       ip: 172.17.99.17
+      mac: 78:e7:d1:65:c9:1b
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:32
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:8e:32
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:33
-      ip6: fe80::7ae7:d1ff:fef9:8e33
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.17
+      ip6: fe80::7ae7:d1ff:fef9:8e33
+      mac: 78:e7:d1:f9:8e:33
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:46
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:8e:47
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:8e:47
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:31
+      interface: InfiniBand
+      ip: 172.18.99.17
+      ip6: fe80::223:7dff:ff94:7331
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:32
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
-  chassis:
-    serial: GB803651JT
-    manufacturer: HP
-    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
index a301a342bea824deb28976128f2c9732e6f91e92..0c2d6d8d152ac14ac7e60f0dad00bdfdb2b018c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-18:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      size: 250059350016
-      rev: HPG2
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651KF
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:d9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.18
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:58:23:db
       ip: 172.17.99.18
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:58:23:db
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:48
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:a5:48
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:49
-      ip6: fe80::dad3:85ff:fee6:a549
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.18
+      ip6: fe80::dad3:85ff:fee6:a549
+      mac: d8:d3:85:e6:a5:49
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:74
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:a5:75
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d8:d3:85:e6:a5:75
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:d9
+      interface: InfiniBand
+      ip: 172.18.99.18
+      ip6: fe80::223:7dff:ff94:93d9
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:da
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651KF
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
index 2d5bd745b8be1ef6f828dd3cf3b2479f89268078..53e40319e89381850d48e6b91e55596538caa1f3 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-23:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651P2
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:55
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d355
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.23
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:56
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:f7:09:69
       ip: 172.17.99.23
+      mac: 78:e7:d1:f7:09:69
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:03:fa
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:fa:03:fa
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:03:fb
-      ip6: fe80::7ae7:d1ff:fefa:3fb
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.23
+      ip6: fe80::7ae7:d1ff:fefa:3fb
+      mac: 78:e7:d1:fa:03:fb
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:fa:13:4a
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:fa:13:4b
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:fa:13:4b
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:55
+      interface: InfiniBand
+      ip: 172.18.99.23
+      ip6: fe80::223:7dff:ff94:d355
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:56
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651P2
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
index 500e7f493a169e9bd0e87ea4f1abc7d3e3f51b73..7009dbabbe90ab45f32c45afa945235b5c8b8612 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-24:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651N6
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:45
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.24
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:f7:09:84
       ip: 172.17.99.24
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:46
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:f7:09:84
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:03:44
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:fa:03:44
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:03:45
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.24
+      ip6: fe80::7ae7:d1ff:fef5:fe99
+      mac: 78:e7:d1:fa:03:45
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:fa:03:18
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:fa:03:19
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:fa:03:19
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:45
+      interface: InfiniBand
+      ip: 172.18.99.24
+      ip6: fe80::223:7dff:ff94:d319
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:46
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651N6
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
index cc55fc5285ca055608fe18ed12af6f5f060be202..e2eb983f4656e5587af3b5dd7e707a706ccf88c9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-26:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651LW
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b21d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.26
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:99:ff
       ip: 172.17.99.26
+      mac: 78:e7:d1:65:99:ff
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:0f:c6
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f5:0f:c6
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:0f:c7
-      ip6: fe80::7ae7:d1ff:fef5:fc7
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.26
+      ip6: fe80::7ae7:d1ff:fef5:fc7
+      mac: 78:e7:d1:f5:0f:c7
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f6:a0:4e
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f6:a0:4f
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f6:a0:4f
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1d
+      interface: InfiniBand
+      ip: 172.18.99.26
+      ip6: fe80::223:7dff:ff94:b21d
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:1e
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651LW
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
index 3eacb383acb6ace466615c89e5ea1fcd5d16d00e..922cd46f536858c8f2defcb6fa096cf4442f7897 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651M1
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:15
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b215
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.27
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:16
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:c9:48
       ip: 172.17.99.27
+      mac: 78:e7:d1:65:c9:48
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:3e:e2
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:3e:e2
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:3e:e3
-      ip6: fe80::7ae7:d1ff:fef9:3ee3
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.27
+      ip6: fe80::7ae7:d1ff:fef9:3ee3
+      mac: 78:e7:d1:f9:3e:e3
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:b0
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:4e:b1
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:4e:b1
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:15
+      interface: InfiniBand
+      ip: 172.18.99.27
+      ip6: fe80::223:7dff:ff94:b215
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:16
+      interface: InfiniBand
+      management: false
       mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: GB803651M1
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
index 52c6057d6857fa09f6f774df83b0788fcd10e478..7b5761d6c5a39f8eb0561268d8d11b19cee24d3d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-29:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651K4
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e1
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.29
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:58:33:77
       ip: 172.17.99.29
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:58:33:77
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:d5:80
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:d5:80
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:d5:81
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.29
+      ip6: fe80::7ae7:d1ff:fef5:fe99
+      mac: d8:d3:85:e6:d5:81
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: d8:d3:85:e6:c5:c6
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:c5:c7
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d8:d3:85:e6:c5:c7
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e1
+      interface: InfiniBand
+      ip: 172.18.99.29
+      ip6: fe80::223:7dff:ff94:d319
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e2
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651K4
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
index d8aee29976ec4addd9e20cc527c6009c663791d4..9d5fe31dff1c433491c0bf9075eed3891e2cc4fb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651K8
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:a9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93a9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.3
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:aa
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:c9:2a
       ip: 172.17.99.3
+      mac: 78:e7:d1:65:c9:2a
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:fa:13:30
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:fa:13:30
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:13:31
-      ip6: fe80::7ae7:d1ff:fefa:1331
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.3
+      ip6: fe80::7ae7:d1ff:fefa:1331
+      mac: 78:e7:d1:fa:13:31
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:fa:13:26
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:fa:13:27
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:fa:13:27
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:a9
+      interface: InfiniBand
+      ip: 172.18.99.3
+      ip6: fe80::223:7dff:ff94:93a9
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:aa
+      interface: InfiniBand
+      management: false
       mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: GB803651K8
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
index dc5e088b4f785889c752b8c26c1711571f81253f..87729a24c81c53c221b55c98757fe4f3ffd71c57 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-30:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651N2
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fb
-      rate: 20000000000
-      ip6: fe80::202:c903:6:23fb
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.30
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fc
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:b9:cf
       ip: 172.17.99.30
+      mac: 78:e7:d1:65:b9:cf
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:04
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:8e:04
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:05
-      ip6: fe80::7ae7:d1ff:fef9:8e05
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.30
+      ip6: fe80::7ae7:d1ff:fef9:8e05
+      mac: 78:e7:d1:f9:8e:05
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:7e:d6
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:7e:d7
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:7e:d7
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fb
+      interface: InfiniBand
+      ip: 172.18.99.30
+      ip6: fe80::202:c903:6:23fb
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:23:fc
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651N2
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
index 09d2590097a850469777c4eea6534410fa19d314..58eb701a599515ee35a7c952606d1faa97bc33c6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-33:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651P9
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d5
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:c3d5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.33
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:65:a9:7a
       ip: 172.17.99.33
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:65:a9:7a
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:6f:52
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:6f:52
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:6f:53
-      ip6: fe80::7ae7:d1ff:fef9:6f53
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.33
+      ip6: fe80::7ae7:d1ff:fef9:6f53
+      mac: 78:e7:d1:f9:6f:53
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:6f:54
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:6f:55
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:6f:55
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d5
+      interface: InfiniBand
+      ip: 172.18.99.33
+      ip6: fe80::223:7dff:ff94:c3d5
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:c3:d6
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651P9
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
index 6263795c3eeb76aba10e674c6d67f9f061efc863..256f0370ffb090dba5a9f6b0643fbb0b86e5b86d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-34:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651NV
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a29d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.34
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:65:b9:36
       ip: 172.17.99.34
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:65:b9:36
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:ae:80
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:ae:80
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:ae:81
-      ip6: fe80::7ae7:d1ff:fef9:ae81
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.34
+      ip6: fe80::7ae7:d1ff:fef9:ae81
+      mac: 78:e7:d1:f9:ae:81
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:ae:7c
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:ae:7d
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:ae:7d
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9d
+      interface: InfiniBand
+      ip: 172.18.99.34
+      ip6: fe80::223:7dff:ff94:a29d
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:9e
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651NV
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
index d21d8c6f35b2f136f63b4bb3e34b0d8b263aaacf..dfacd3dbba2b7f601eaacdaeaaea34b7e2b70def 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-36:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651NR
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:59
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a259
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.36
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:b9:fb
       ip: 172.17.99.36
+      mac: 78:e7:d1:65:b9:fb
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:8e:72
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:8e:72
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:73
-      ip6: fe80::7ae7:d1ff:fef9:8e73
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.36
+      ip6: fe80::7ae7:d1ff:fef9:8e73
+      mac: 78:e7:d1:f9:8e:73
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:a0
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:8e:a1
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:8e:a1
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:59
+      interface: InfiniBand
+      ip: 172.18.99.36
+      ip6: fe80::223:7dff:ff94:a259
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:5a
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
-  chassis:
-    serial: GB803651NR
-    manufacturer: HP
-    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
index 34857431c4b0fa4345a617769deae17bf596ab88..b2746b07266efb8c5d9d8b98f334d43c98fc584b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-37:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651P3
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:41
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d341
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.37
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:f7:09:42
       ip: 172.17.99.37
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:42
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:f7:09:42
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:3e:f8
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:3e:f8
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:3e:f9
-      ip6: fe80::7ae7:d1ff:fef9:3ef9
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.37
+      ip6: fe80::7ae7:d1ff:fef9:3ef9
+      mac: 78:e7:d1:f9:3e:f9
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:3e:fa
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:3e:fb
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:3e:fb
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:41
+      interface: InfiniBand
+      ip: 172.18.99.37
+      ip6: fe80::223:7dff:ff94:d341
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:42
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
-  chassis:
-    serial: GB803651P3
-    manufacturer: HP
-    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
index ded64c7da6e1677d733dd30b7ef016a82e656539..44517292c71a33b7f9dffd10cbc33faa37418f08 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-39:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651NW
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:29
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d329
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.39
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:2a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:b9:65
       ip: 172.17.99.39
+      mac: 78:e7:d1:65:b9:65
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:ae:40
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:ae:40
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:ae:41
-      ip6: fe80::7ae7:d1ff:fef9:ae41
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.39
+      ip6: fe80::7ae7:d1ff:fef9:ae41
+      mac: 78:e7:d1:f9:ae:41
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:ae:44
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:ae:45
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:ae:45
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:29
+      interface: InfiniBand
+      ip: 172.18.99.39
+      ip6: fe80::223:7dff:ff94:d329
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:2a
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651NW
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
index 25090b50906eae8d937a412f2f519d8dbfbb035c..9a2e8dbe13ebc2dc2c4b0514eb58ba062ee0b693 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651NH
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:49
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b249
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.4
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:c9:4f
       ip: 172.17.99.4
+      mac: 78:e7:d1:65:c9:4f
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f9:5e:34
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:5e:34
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:5e:35
-      ip6: fe80::7ae7:d1ff:fef9:5e35
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.4
+      ip6: fe80::7ae7:d1ff:fef9:5e35
+      mac: 78:e7:d1:f9:5e:35
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f9:5e:58
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f9:5e:59
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f9:5e:59
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:49
+      interface: InfiniBand
+      ip: 172.18.99.4
+      ip6: fe80::223:7dff:ff94:b249
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4a
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651NH
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
index 728afbaf47dd371e3ad904db637688ba5ca5b51c..87489c77fa523820d7db5df30657ce834b532cb5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-40:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651KS
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:1f
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.40
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:58:33:0b
       ip: 172.17.99.40
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:20
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:58:33:0b
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:a5:e2
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:a5:e2
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:e3
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.40
+      ip6: fe80::7ae7:d1ff:fef5:fe99
+      mac: d8:d3:85:e6:a5:e3
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:ec
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:a5:ed
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d8:d3:85:e6:a5:ed
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:1f
+      interface: InfiniBand
+      ip: 172.18.99.40
+      ip6: fe80::223:7dff:ff94:d319
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:37:20
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: GB0250EAFYK
-      size: 250059350016
       rev: HPG2
+      size: 250059350016
       vendor: ATA
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651KS
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
index 21fb18294458ea7e49d1f8f34f85793652f9832a..846b29c0b484b727fd0d52e28789c05b3c23395e 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651PN
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:49
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d349
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.5
-      driver: mlx4_core
-      mountable: true
     bmc:
-      mac: 78:e7:d1:58:33:1d
       ip: 172.17.99.5
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
+      mac: 78:e7:d1:58:33:1d
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:5d:2c:44
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:5d:2c:44
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:5d:2c:45
-      ip6: fe80::7ae7:d1ff:fe5d:2c45
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.5
+      ip6: fe80::7ae7:d1ff:fe5d:2c45
+      mac: 78:e7:d1:5d:2c:45
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:5d:2c:34
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:5d:2c:35
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:5d:2c:35
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:49
+      interface: InfiniBand
+      ip: 172.18.99.5
+      ip6: fe80::223:7dff:ff94:d349
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4a
+      interface: InfiniBand
+      management: false
       mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  processor:
+    cache_l1d: 65536
+    cache_l1i: 65536
+    cache_l2: 524288
+    cache_l3: 5240832
+    clock_speed: 1700000000
+    instruction_set: x86-64
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
   storage_devices:
     sda:
       model: VB0250EAVER
-      size: 250059350016
       rev: HPG0
+      size: 250059350016
       vendor: ATA
-  chassis:
-    serial: GB803651PN
-    manufacturer: HP
-    name: ProLiant DL165 G7
   supported_job_types:
     virtual: amd-v
-  main_memory:
-    ram_size: 51539607552
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
-    cache_l2: 524288
-    cache_l3: 5240832
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
index 69f432156df4f59ee6f460889dbf99a59951107c..7ec9b15bcf17a7c0b7f6bffd2f75b1ee7055e069 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651NM
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:39
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b239
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.6
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:3a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:58:33:50
       ip: 172.17.99.6
+      mac: 78:e7:d1:58:33:50
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: d8:d3:85:e6:95:e8
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:95:e8
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:95:e9
-      ip6: fe80::dad3:85ff:fee6:95e9
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.6
+      ip6: fe80::dad3:85ff:fee6:95e9
+      mac: d8:d3:85:e6:95:e9
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: d8:d3:85:e6:95:ec
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: d8:d3:85:e6:95:ed
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: d8:d3:85:e6:95:ed
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:39
+      interface: InfiniBand
+      ip: 172.18.99.6
+      ip6: fe80::223:7dff:ff94:b239
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:3a
+      interface: InfiniBand
+      management: false
       mountable: false
-  chassis:
-    serial: GB803651NM
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
index 37a889a9a13482e812a24c1a31159395a27f26c1..c284743ae303fee43868456937b98a42525b46d7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.yaml
@@ -1,97 +1,98 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 09/06/2010
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651J9
+  main_memory:
+    ram_size: 51539607552
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d34d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.7
-      driver: mlx4_core
-      mountable: true
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     bmc:
-      mac: 78:e7:d1:65:99:eb
       ip: 172.17.99.7
+      mac: 78:e7:d1:65:99:eb
     eth0:
-      mounted: false
-      rate: 100000000
-      mac: 78:e7:d1:f5:0f:38
-      management: false
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f5:0f:38
+      management: false
       mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:0f:39
-      ip6: fe80::7ae7:d1ff:fef5:f39
-      management: false
+      driver: igb
       enabled: true
       interface: Ethernet
-      driver: igb
-      mountable: true
       ip: 172.16.99.7
+      ip6: fe80::7ae7:d1ff:fef5:f39
+      mac: 78:e7:d1:f5:0f:39
+      management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      enabled: false
+      interface: Ethernet
       mac: 78:e7:d1:f5:ef:88
       management: false
+      mountable: false
+      mounted: false
+    eth3:
+      driver: igb
       enabled: false
       interface: Ethernet
-      driver: igb
+      mac: 78:e7:d1:f5:ef:89
+      management: false
       mountable: false
-    eth3:
       mounted: false
-      mac: 78:e7:d1:f5:ef:89
+    ib0:
+      driver: mlx4_core
+      enabled: true
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4d
+      interface: InfiniBand
+      ip: 172.18.99.7
+      ip6: fe80::223:7dff:ff94:d34d
       management: false
+      mountable: true
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
       enabled: false
-      interface: Ethernet
-      driver: igb
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:4e
+      interface: InfiniBand
+      management: false
       mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: GB803651J9
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 1700000000
-    other_description: AMD Opteron(tm) Processor 6164 HE
-    version: 6164 HE
+    cache_l1i: 65536
     cache_l2: 524288
     cache_l3: 5240832
-    vendor: AMD
+    clock_speed: 1700000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 51539607552
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
+    model: AMD Opteron
+    other_description: AMD Opteron(tm) Processor 6164 HE
+    vendor: AMD
+    version: 6164 HE
+  storage_devices:
+    sda:
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
+      vendor: ATA
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
index b438e72ee7a961a534a7c9a241590c426e1ba59d..c385fe1e0a6673eb08618985ba26db4c21ea86b3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -1,66 +1,67 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-66:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 2GWGG42
   architecture:
     platform_type: x86_64
-    smt_size: 16
     smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R630
+    serial: 2GWGG42
   main_memory:
     ram_size: 137438953472
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:74:dd
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.96.66
+      mac: ec:f4:bb:cf:74:d8
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:74:da
       interface: Ethernet
+      mac: ec:f4:bb:cf:74:da
+      management: false
+      mounted: false
       rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:74:dc
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:cf:74:dc
       management: false
-      mac: ec:f4:bb:cf:74:d8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.66
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  supported_job_types:
-    virtual: ivt
+      mac: ec:f4:bb:cf:74:dd
+      management: false
+      mounted: false
   processor:
-    cache_l3: 20971520
-    cache_l2: 262144
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
     cache_l1d: 32768
     cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 20971520
+    clock_speed: 2400000000
     instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
     model: Intel Xeon
-    clock_speed: 2400000000
+    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
+    vendor: Intel
+    version: E5-2630 v3
+  storage_devices:
+    sda:
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
index 9759d51a231ba643d83427e1dfa9842637216df9..c07e2813e1d21056ec66fd9a86dce59a8fd095c5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-3.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sol-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10B
+  main_memory:
+    ram_size: 4293918720
   network_adapters:
+    bmc:
+      ip: 172.17.129.3
+      mac: 00:16:36:91:f6:f4
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:24
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
+      driver: forcedeth
       enabled: true
       interface: Ethernet
-      driver: forcedeth
-      mountable: true
       ip: 172.16.129.3
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:eb:25
+      ip6: fe80::216:36ff:fe91:e918
+      mac: 00:16:36:91:eb:24
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: forcedeth
       enabled: false
       interface: Ethernet
-      driver: forcedeth
+      mac: 00:16:36:91:eb:25
+      management: false
       mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f4
-      ip: 172.17.129.3
-  chassis:
-    serial: 0650QBT10B
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2600000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
+    model: AMD Opteron
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    vendor: AMD
+    version: 2218
+  storage_devices:
+    sda:
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
index c6fab4d5b73097477c5af7220d357ebd9ad373d5..607e530029382e090482c1e03f5ab228a8667f91 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-36.yaml
@@ -1,73 +1,74 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sol-36:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10B
+  main_memory:
+    ram_size: 4293918720
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:DD:47:4C:45
-      ip6: fe80::260:ddff:fe47:4c45
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.36
-      driver: mx ethernet (myri)
-      mountable: true
+    bmc:
+      ip: 172.17.129.36
+      mac: 00:16:36:91:f6:f7
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:08
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
+      driver: forcedeth
       enabled: true
       interface: Ethernet
-      driver: forcedeth
-      mountable: true
       ip: 172.16.129.36
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:09
+      ip6: fe80::216:36ff:fe91:e918
+      mac: 00:16:36:91:ea:08
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: forcedeth
       enabled: false
       interface: Ethernet
-      driver: forcedeth
+      mac: 00:16:36:91:ea:09
+      management: false
       mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f7
-      ip: 172.17.129.36
-  chassis:
-    serial: 0650QBT10B
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: true
+      interface: Myrinet
+      ip: 172.18.129.36
+      ip6: fe80::260:ddff:fe47:4c45
+      mac: 00:60:DD:47:4C:45
+      management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2600000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
+    model: AMD Opteron
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    vendor: AMD
+    version: 2218
+  storage_devices:
+    sda:
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
index f0d8d7466f4e923bae386bfba2e51ba938a22af1..cc2cb31f1ca3b2de4449fe1c0cc1a870ad56dd1a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-42.yaml
@@ -1,73 +1,74 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sol-42:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10B
+  main_memory:
+    ram_size: 4293918720
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:34
-      ip6: fe80::260:ddff:fe47:4c45
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.42
-      driver: mx ethernet (myri)
-      mountable: true
+    bmc:
+      ip: 172.17.129.42
+      mac: 00:16:36:c5:93:79
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:90
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
+      driver: forcedeth
       enabled: true
       interface: Ethernet
-      driver: forcedeth
-      mountable: true
       ip: 172.16.129.42
-    eth1:
-      mounted: false
-      mac: 00:16:36:91:ea:91
+      ip6: fe80::216:36ff:fe91:e918
+      mac: 00:16:36:91:ea:90
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: forcedeth
       enabled: false
       interface: Ethernet
-      driver: forcedeth
+      mac: 00:16:36:91:ea:91
+      management: false
       mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:79
-      ip: 172.17.129.42
-  chassis:
-    serial: 0650QBT10B
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
+      mounted: false
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: true
+      interface: Myrinet
+      ip: 172.18.129.42
+      ip6: fe80::260:ddff:fe47:4c45
+      mac: 00:60:dd:47:4c:34
+      management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2600000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
+    model: AMD Opteron
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    vendor: AMD
+    version: 2218
+  storage_devices:
+    sda:
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
index 8dfcd8abe8be533d94796d288af96ddc85ab1ecb..6de504d4b3996438d71588e43c72da1b5030406f 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-47.yaml
@@ -1,73 +1,74 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sol-47:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: xxxxxxxxxx
+  main_memory:
+    ram_size: 4293918720
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:32
-      ip6: fe80::260:ddff:fe47:4c32
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.47
-      driver: mx ethernet (myri)
-      mountable: true
+    bmc:
+      ip: 172.17.129.47
+      mac: 00:16:36:e9:2f:a2
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e9:26:c6
-      ip6: fe80::216:36ff:fee9:26c6
-      management: false
+      driver: forcedeth
       enabled: true
       interface: Ethernet
-      driver: forcedeth
-      mountable: true
       ip: 172.16.129.47
-    eth1:
-      mounted: false
-      mac: 00:16:36:e9:26:c7
+      ip6: fe80::216:36ff:fee9:26c6
+      mac: 00:16:36:e9:26:c6
       management: false
-      mountable: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
       driver: forcedeth
       enabled: false
       interface: Ethernet
-    bmc:
-      mac: 00:16:36:e9:2f:a2
-      ip: 172.17.129.47
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mac: 00:16:36:e9:26:c7
+      management: false
+      mountable: false
+      mounted: false
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: true
+      interface: Myrinet
+      ip: 172.18.129.47
+      ip6: fe80::260:ddff:fe47:4c32
+      mac: 00:60:dd:47:4c:32
+      management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2600000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
+    model: AMD Opteron
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    vendor: AMD
+    version: 2218
+  storage_devices:
+    sda:
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
index 004597171fb8d42dd5cb91b6bb18dadc1faf7ca5..f8b0a4d9f12251778986fa6655eb0c10c994cdf4 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-49.yaml
@@ -1,73 +1,74 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 sol-49:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT110
+  main_memory:
+    ram_size: 4293918720
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6a
-      ip6: fe80::260:ddff:fe47:4c6a
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.49
-      driver: mx ethernet (myri)
-      mountable: true
+    bmc:
+      ip: 172.17.129.49
+      mac: 00:16:36:c5:92:7f
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c5:89:17
-      ip6: fe80::216:36ff:fec5:8917
-      management: false
+      driver: forcedeth
       enabled: true
       interface: Ethernet
-      driver: forcedeth
-      mountable: true
       ip: 172.16.129.49
-    eth1:
-      mounted: false
-      mac: 00:16:36:c5:89:18
+      ip6: fe80::216:36ff:fec5:8917
+      mac: 00:16:36:c5:89:17
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: forcedeth
       enabled: false
       interface: Ethernet
-      driver: forcedeth
+      mac: 00:16:36:c5:89:18
+      management: false
       mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:7f
-      ip: 172.17.129.49
+      mounted: false
+    myri0:
+      driver: mx ethernet (myri)
+      enabled: true
+      interface: Myrinet
+      ip: 172.18.129.49
+      ip6: fe80::260:ddff:fe47:4c6a
+      mac: 00:60:dd:47:4c:6a
+      management: false
+      mountable: true
+      mounted: true
+      rate: 10000000000
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial: 0650QBT110
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 4293918720
   processor:
-    model: AMD Opteron
     cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
+    cache_l1i: 65536
     cache_l2: 1048576
     cache_l3: 0
-    vendor: AMD
+    clock_speed: 2600000000
     instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
+    model: AMD Opteron
+    other_description: Dual-Core AMD Opteron(tm) Processor 2218
+    vendor: AMD
+    version: 2218
+  storage_devices:
+    sda:
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
+      vendor: Hitachi
+  supported_job_types:
+    virtual: amd-v
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
index b68b79c5ff5660e7f0b02b0befb7523bab136c86..56109f851a9cedba98f1a8ffffe427daac025980 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-1.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: ''
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.1
+      mac: 00:26:b9:58:e6:84
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:58:e6:82
-      ip6: fe80::226:b9ff:fe58:e682
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.1
-    eth1:
-      mounted: false
-      mac: 00:26:b9:58:e6:83
+      ip6: fe80::226:b9ff:fe58:e682
+      mac: 00:26:b9:58:e6:82
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:58:e6:83
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:58:e6:84
-      ip: 172.17.130.1
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: ''
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
index 4e1b36868a1708bff063f0d86ba1adf4027d7c56..0c21db1d6b4d3faa4ba270d4233a8ff19d047516 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-10.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: G4JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.10
+      mac: 00:26:b9:3f:49:67
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:65
-      ip6: fe80::226:b9ff:fe3f:4965
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.10
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:66
+      ip6: fe80::226:b9ff:fe3f:4965
+      mac: 00:26:b9:3f:49:65
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:49:66
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:67
-      ip: 172.17.130.10
-  chassis:
-    serial: G4JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
index 34364f91ce74c5c0586720eb5f481536c8bd6c66..f9238ce46908b9c05055796b8fdeeb14a8c093d2 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-12.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-12:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 45JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.12
+      mac: 00:26:b9:3f:49:5e
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:5c
-      ip6: fe80::226:b9ff:fe3f:495c
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.12
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:49:5d
+      ip6: fe80::226:b9ff:fe3f:495c
+      mac: 00:26:b9:3f:49:5c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:49:5d
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:5e
-      ip: 172.17.130.12
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  chassis:
-    serial: 45JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
index d5c91bf5164959de2da6d75641d48ded54438b56..9fe143747beb8b949dff43b37b15845853355c88 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-13.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-13:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 15JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.13
+      mac: 00:26:b9:3f:4c:7a
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4c:78
-      ip6: fe80::226:b9ff:fe3f:4c78
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.13
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4c:79
+      ip6: fe80::226:b9ff:fe3f:4c78
+      mac: 00:26:b9:3f:4c:78
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:4c:79
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4c:7a
-      ip: 172.17.130.13
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  chassis:
-    serial: 15JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
index 4c4cb8089e32457915b505aeb1351f2a25306411..77b8b254a5361fde4a3b33509035c594b90f4720 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-16.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-16:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 33JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.16
+      mac: 00:26:b9:3f:41:0e
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:0c
-      ip6: fe80::226:b9ff:fe3f:410c
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.16
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:41:0d
+      ip6: fe80::226:b9ff:fe3f:410c
+      mac: 00:26:b9:3f:41:0c
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:41:0d
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:0e
-      ip: 172.17.130.16
-  chassis:
-    serial: 33JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
index c3dbc0afe6b0b5a0da27faf41346eb606448dcaa..8825f6498982332132f0a61e8656d9972633f1b4 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-21.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-21:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 85JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.21
+      mac: 00:26:b9:3f:3f:fd
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3f:fb
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.21
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:3f:fc
+      ip6: fe80::226:b9ff:fe3f:4adc
+      mac: 00:26:b9:3f:3f:fb
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:3f:fc
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3f:fd
-      ip: 172.17.130.21
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 85JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
index 6a511c621e54bd63c0322949b3601ac0b6a2794d..245e6130837fb487a4c17f2600dbd2b78d232793 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-25.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-25:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 44JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.25
+      mac: 00:26:b9:3f:47:a4
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:a2
-      ip6: fe80::226:b9ff:fe3f:47a2
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.25
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:a3
+      ip6: fe80::226:b9ff:fe3f:47a2
+      mac: 00:26:b9:3f:47:a2
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:47:a3
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:a4
-      ip: 172.17.130.25
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2260000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: PERC 6/i Adapter
-      size: 598879502336
       rev: 1.22
+      size: 598879502336
       vendor: Dell
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 44JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
index 644629ca912e6f6d36ce23d91ea5347c5bbda5ec..8feea0260c3abd9e8af851ea565f736fa57f8088 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-27.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 35JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.27
+      mac: 00:26:b9:3f:4b:64
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:62
-      ip6: fe80::226:b9ff:fe3f:4b62
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.27
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:63
+      ip6: fe80::226:b9ff:fe3f:4b62
+      mac: 00:26:b9:3f:4b:62
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:4b:63
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:64
-      ip: 172.17.130.27
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 35JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
index 4475c8a9bcd6e6d5416bf42f2b64b0a5a434817c..8f1d743a3de702b7f2abb93676e2dd2f826241fe 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-29.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-29:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: D3JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.29
+      mac: 00:26:b9:3f:47:bc
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:ba
-      ip6: fe80::226:b9ff:fe3f:47ba
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.29
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:47:bb
+      ip6: fe80::226:b9ff:fe3f:47ba
+      mac: 00:26:b9:3f:47:ba
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:47:bb
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:bc
-      ip: 172.17.130.29
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2260000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: PERC 6/i Adapter
-      size: 598879502336
       rev: 1.22
+      size: 598879502336
       vendor: Dell
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: D3JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
index 6a0240e29747acbd2225ce3484e442532430ac06..a4c25be8f0e429b4eec015296697f4d65a275125 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-3.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: '8.2'
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 14JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.3
+      mac: 00:26:b9:3f:4a:60
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:5e
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.3
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4a:5f
+      ip6: fe80::226:b9ff:fe3f:4adc
+      mac: 00:26:b9:3f:4a:5e
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:4a:5f
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:60
-      ip: 172.17.130.3
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 14JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
+      mounted: false
+  operating_system:
+    kernel: 3.16.0-4-amd64
+    name: debian
+    version: '8.2'
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
index b9f9e1b3ad74bb4a7052645d11077d97c400e49d..cd9046ae9ddbd7d515bc31ed544034b5779124a9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-39.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-39:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: J4JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.39
+      mac: 00:26:b9:3f:4b:31
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:2f
-      ip6: fe80::226:b9ff:fe3f:4b2f
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.39
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:4b:30
+      ip6: fe80::226:b9ff:fe3f:4b2f
+      mac: 00:26:b9:3f:4b:2f
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:4b:30
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:31
-      ip: 172.17.130.39
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
+  processor:
+    cache_l1d: 32768
+    cache_l1i: 32768
+    cache_l2: 262144
+    cache_l3: 8388608
+    clock_speed: 2260000000
+    instruction_set: x86-64
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
   storage_devices:
     sda:
       model: PERC 6/i Adapter
-      size: 598879502336
       rev: 1.22
+      size: 598879502336
       vendor: Dell
-  chassis:
-    serial: J4JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
-    cache_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
index 3416cfaf4c912dfaa8377a5663fd5e94425ea84d..38e2111f5fda777fd0d74937794e96b40c058edc 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-44.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-44:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: B3JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.44
+      mac: 00:26:b9:3f:45:30
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:45:2e
-      ip6: fe80::226:b9ff:fe3f:452e
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.44
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:45:2f
+      ip6: fe80::226:b9ff:fe3f:452e
+      mac: 00:26:b9:3f:45:2e
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:45:2f
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:45:30
-      ip: 172.17.130.44
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  chassis:
-    serial: B3JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  supported_job_types:
-    virtual: ivt
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
index 480bdda00aeca887c4f533c44626c6f28b500c50..d73c78649bfe916f8c7cf2cbd571283312a108e5 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-5.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 73JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.5
+      mac: 00:26:b9:3e:e8:5a
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3e:e8:58
-      ip6: fe80::226:b9ff:fe3e:e858
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.5
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3e:e8:59
+      ip6: fe80::226:b9ff:fe3e:e858
+      mac: 00:26:b9:3e:e8:58
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3e:e8:59
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3e:e8:5a
-      ip: 172.17.130.5
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 73JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
index d25657722f52f14a32c181995fb657eb2e815194..9b029f16de57e8089040afe43de6cb7821e2daef 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-6.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: G3JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.6
+      mac: 00:26:b9:3f:40:b1
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:40:af
-      ip6: fe80::226:b9ff:fe3f:40af
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.6
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:40:b0
+      ip6: fe80::226:b9ff:fe3f:40af
+      mac: 00:26:b9:3f:40:af
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:40:b0
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:40:b1
-      ip: 172.17.130.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: G3JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
index feb5075b8112cc40f183d547e559e1e061aaa22a..08fce4154bde75f845cd7e976336962719093a90 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-9.yaml
@@ -1,62 +1,63 @@
+# This file was *not* generated by g5k-checks (g5k-checks -m api)
 ---
 suno-9:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.1.5
     release_date: 07/29/2009
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 83JPH4J
+  main_memory:
+    ram_size: 34359738368
   network_adapters:
+    bmc:
+      ip: 172.17.130.9
+      mac: 00:26:b9:3f:41:29
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:27
-      ip6: fe80::226:b9ff:fe3f:4127
-      management: false
+      driver: bnx2
       enabled: true
       interface: Ethernet
-      driver: bnx2
-      mountable: true
       ip: 172.16.130.9
-    eth1:
-      mounted: false
-      mac: 00:26:b9:3f:41:28
+      ip6: fe80::226:b9ff:fe3f:4127
+      mac: 00:26:b9:3f:41:27
       management: false
+      mountable: true
+      mounted: true
+      rate: 1000000000
+    eth1:
+      driver: bnx2
       enabled: false
       interface: Ethernet
-      driver: bnx2
+      mac: 00:26:b9:3f:41:28
+      management: false
       mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:29
-      ip: 172.17.130.9
+      mounted: false
   operating_system:
     kernel: 3.16.0-4-amd64
     name: debian
     version: '8.2'
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 83JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  main_memory:
-    ram_size: 34359738368
   processor:
-    model: Intel Xeon
     cache_l1d: 32768
-    clock_speed: 2260000000
-    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
-    version: E5520
+    cache_l1i: 32768
     cache_l2: 262144
     cache_l3: 8388608
-    vendor: Intel
+    clock_speed: 2260000000
     instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+    model: Intel Xeon
+    other_description: Intel(R) Xeon(R) CPU           E5520  @ 2.27GHz
+    vendor: Intel
+    version: E5520
+  storage_devices:
+    sda:
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
+      vendor: Dell
+  supported_job_types:
+    virtual: ivt