diff --git a/generators/lib/hash/hash.rb b/generators/lib/hash/hash.rb
index f594a6f8741ad0900026d7668c1ab691ed03f003..c07cdf20535388ab197ed7584be7d56d6ad544fd 100644
--- a/generators/lib/hash/hash.rb
+++ b/generators/lib/hash/hash.rb
@@ -11,6 +11,40 @@ def deep_merge_entries(a, b)
   end
 end
 
+# Write pretty and sorted JSON files
+def write_json(filepath, data)
+  def rec_sort(h)
+    case h
+    when Array
+      h.map{|v| rec_sort(v)}#.sort_by!{|v| (v.to_s rescue nil) }
+    when Hash
+      Hash[Hash[h.map{|k,v| [rec_sort(k),rec_sort(v)]}].sort_by{|k,v| [(k.to_s rescue nil), (v.to_s rescue nil)]}]
+    else
+      h
+    end
+  end
+  File.open(filepath, 'w') do |f|
+    f.write(JSON.pretty_generate(rec_sort(data)))
+  end
+end
+
+# Write sorted YAML files
+def write_yaml(filepath, data)
+  def rec_sort(h)
+    case h
+    when Array
+      h.map{|v| rec_sort(v)}#.sort_by!{|v| (v.to_s rescue nil) }
+    when Hash
+      Hash[Hash[h.map{|k,v| [rec_sort(k),rec_sort(v)]}].sort_by{|k,v| [(k.to_s rescue nil), (v.to_s rescue nil)]}]
+    else
+      h
+    end
+  end
+  File.open(filepath, 'w') do |f|
+    f.write(rec_sort(data).to_yaml)
+  end
+end
+
 # Extend Hash with helper methods needed to convert input data files to ruby Hash
 class ::Hash
 
diff --git a/generators/reference-api/reference-api.rb b/generators/reference-api/reference-api.rb
index c0a4520ae4fdf9582403e8aaf3c62d8393571b6e..6ba3a4a89c319cd6bd6c8d46dca47cbd883ad395 100755
--- a/generators/reference-api/reference-api.rb
+++ b/generators/reference-api/reference-api.rb
@@ -16,23 +16,6 @@ refapi_path = "/tmp/data"
 #global_hash = load_yaml_file_hierarchy("../../input/example/")
 global_hash = load_yaml_file_hierarchy("../../input/grid5000/")
 
-# Write pretty and sorted JSON files
-def write_json(filepath, data)
-  def rec_sort(h)
-    case h
-    when Array
-      h.map{|v| rec_sort(v)}#.sort_by!{|v| (v.to_s rescue nil) }
-    when Hash
-      Hash[Hash[h.map{|k,v| [rec_sort(k),rec_sort(v)]}].sort_by{|k,v| [(k.to_s rescue nil), (v.to_s rescue nil)]}]
-    else
-      h
-    end
-  end
-  File.open(filepath, 'w') do |f|
-    f.write(JSON.pretty_generate(rec_sort(data)))
-  end
-end
-
 # Parse network equipment description and return switch name and port connected to given node
 #  In the network description, if the node interface is given (using "port" attribute),
 #  the interface parameter must be used.
@@ -195,7 +178,7 @@ global_hash["sites"].each do |site_uid, site|
           end
         }
        
-        pp node["monitoring"]["wattmeter"]
+        #pp node["monitoring"]["wattmeter"]
 
         if node["monitoring"]["wattmeter"] != "false"
           node["sensors"]["power"]["via"]["api"] ||= {}
diff --git a/generators/run-g5kchecks/postprocessing.rb b/generators/run-g5kchecks/postprocessing.rb
new file mode 100644
index 0000000000000000000000000000000000000000..370929ed5991bca9db3ba6cf9b04236c936123a5
--- /dev/null
+++ b/generators/run-g5kchecks/postprocessing.rb
@@ -0,0 +1,40 @@
+#!/usr/bin/ruby
+
+require 'pp'
+require 'erb'
+require 'fileutils'
+require 'pathname'
+require 'yaml'
+require '../lib/hash/hash'
+
+####
+
+list_of_yaml_files = Dir['output/*.y*ml'].sort_by { |x| -x.count('/') }
+list_of_yaml_files.each { |filename|
+  file     = filename.split("/")[1]
+  node_uid = file.split(".")[0]
+  site_uid = file.split(".")[1]
+  cluster_uid = node_uid.split("-")[0]
+
+  hash = YAML::load_file(filename)
+
+  hash["storage_devices"] = hash.delete("block_devices")
+  hash["storage_devices"]  = hash["storage_devices"].sort_by_array(["sda", "sdb", "sdc", "sdd", "sde"])
+  
+  hash["network_adapters"] = hash.delete("network_interfaces")
+  hash["network_adapters"] = hash["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0", "ib1", "ib2", "ib3", "bmc"])
+ 
+  hash["chassis"]["name"] = hash["chassis"].delete("product_name")
+  hash["chassis"]["serial"] = hash["chassis"].delete("serial_number")
+
+  hash = {node_uid => hash}
+ 
+  new_filename = "../../input/grid5000/sites/#{site_uid}/clusters/#{cluster_uid}/nodes/" + node_uid + ".yaml"
+  write_yaml(new_filename, hash)
+
+  contents = File.read(new_filename)
+  File.open(new_filename, 'w') { |file| 
+    file.write("# Generated by g5k-checks (g5k-checks -m api)\n")
+    file.write(contents) 
+  }
+}
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/adonis_diff.yaml b/input/grid5000/sites/grenoble/clusters/adonis/adonis_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..09478626b1b5157d08deff1b477f202e7f266e96
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/adonis/adonis_diff.yaml
@@ -0,0 +1,110 @@
+---
+nodes:
+  adonis-[1-10]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      ib0:
+        enabled: true
+        mountable: true
+    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:
+        vendor: Western Digital
+
+  adonis-1:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.1
+        mac: 00:30:48:cc:b0:58
+      eth0:
+        ip6: fe80::230:48ff:fecc:7fd8
+  adonis-10:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.10
+        mac: 00:30:48:cc:ad:df
+      eth0:
+        ip6: fe80::230:48ff:fecc:8310
+        mountable: true
+  adonis-2:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.2
+        mac: 00:30:48:cc:b0:59
+      eth0:
+        ip6: fe80::230:48ff:fecc:7fda
+  adonis-3:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.3
+        mac: 00:30:48:cc:b5:f6
+      eth0:
+        ip6: fe80::230:48ff:fecd:c6a4
+  adonis-4:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.4
+        mac: 00:30:48:cc:b6:6c
+      eth0:
+        ip6: fe80::230:48ff:fecd:c0ac
+  adonis-5:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.5
+        mac: 00:30:48:cc:af:61
+      eth0:
+        ip6: fe80::230:48ff:fecc:7e0a
+  adonis-6:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.6
+        mac: 00:30:48:cc:ad:f2
+      eth0:
+        ip6: fe80::230:48ff:fecc:7abc
+  adonis-8:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.8
+        mac: 00:30:48:cc:b6:6d
+      eth0:
+        ip6: fe80::230:48ff:fecd:c0ae
+  adonis-9:
+    chassis:
+      serial: '1234567890'
+    network_adapters:
+      bmc:
+        ip: 172.17.18.9
+        mac: 00:25:90:4b:bd:b1
+      eth0:
+        ip6: fe80::225:90ff:fe4c:e984
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
index ef3e3e1ba38144f0fb0305d05d3cee9664570ea9..4444debfbe14d010002faea09521167669c15abc 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-1:
+  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
-      device: sda
-      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:17:55
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1755
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.1
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7f:d8
-      ip6: fe80::230:48ff:fecc:7fd8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.1
+      mac: 00:30:48:cc:7f:d8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cc:7f:d9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b0:58
-      ip: 172.17.18.1
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55
+      interface: InfiniBand
+      ip: 172.18.18.1
+      ip6: fe80::230:48ff:ffcc:1755
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2502ABYS-0
+      rev: 3.0
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
index b68a2d044d42aab862695cff3d191f839d70ad2a..f8bb422e7c5aaad6458182d7e90cc8a19992d344 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
+    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:17:69
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1769
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.10
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:83:10
-      ip6: fe80::230:48ff:fecc:8310
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.10
+      mac: 00:30:48:cc:83:10
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cc:83:11
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:ad:df
-      ip: 172.17.18.10
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69
+      interface: InfiniBand
+      ip: 172.18.18.10
+      ip6: fe80::230:48ff:ffcc:1769
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: WDC WD2502ABYS-0
       device: sda
-      size: 251059544064
+      model: WDC WD2502ABYS-0
       rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
index 5ec70cff964b43b4cbe4ae0b710f7220fbedcc77..44109f6a09a976c6163246d9511945dd0f0c6b83 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-2:
+  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
-      device: sda
-      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:17:59
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1759
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.2
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7f:da
-      ip6: fe80::230:48ff:fecc:7fda
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.2
+      mac: 00:30:48:cc:7f:da
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cc:7f:db
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b0:59
-      ip: 172.17.18.2
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59
+      interface: InfiniBand
+      ip: 172.18.18.2
+      ip6: fe80::230:48ff:ffcc:1759
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2502ABYS-0
+      rev: 3.0
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
index a7feed8fcfd4c530395807f34d9a1813e2e21e03..a3168bebc578e57df99dd3b598dedbd4552c34b8 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
+    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:49
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:3d49
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.3
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c6:a4
-      ip6: fe80::230:48ff:fecd:c6a4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.3
+      mac: 00:30:48:cd:c6:a4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cd:c6:a5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b5:f6
-      ip: 172.17.18.3
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49
+      interface: InfiniBand
+      ip: 172.18.18.3
+      ip6: fe80::230:48ff:ffcc:3d49
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: WDC WD2502ABYS-0
       device: sda
-      size: 251059544064
+      model: WDC WD2502ABYS-0
       rev: 3.0
-      vendor: Western Digital
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
index 1dd6161ed9cc4508eab7ec8f840c39102f7e7e01..d9718a5f52fd8dabba4c1f3fce2fc5ad2cc27676 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-4:
+  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
-      device: sda
-      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:45
-      rate: 40000000000
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.4
-      ip6: fe80::230:48ff:ffcc:3d45
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c0:ac
-      ip6: fe80::230:48ff:fecd:c0ac
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.4
+      mac: 00:30:48:cd:c0:ac
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cd:c0:ad
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b6:6c
-      ip: 172.17.18.4
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45
+      interface: InfiniBand
+      ip: 172.18.18.4
+      ip6: fe80::230:48ff:ffcc:3d45
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2502ABYS-0
+      rev: 3.0
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
index 13192c73c2c9e83b5eb2b91d774e36ea2a5b830f..60bfc989b51b05d2df97425aa3c8bde768723839 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
+    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:14:65
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:1465
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.5
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7e:0a
-      ip6: fe80::230:48ff:fecc:7e0a
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.5
+      mac: 00:30:48:cc:7e:0a
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cc:7e:0b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:af:61
-      ip: 172.17.18.5
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65
+      interface: InfiniBand
+      ip: 172.18.18.5
+      ip6: fe80::230:48ff:ffcc:1465
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: WDC WD2502ABYS-0
       device: sda
-      size: 251059544064
+      model: WDC WD2502ABYS-0
       rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
index 38ad2b66df191898c5f0872b1001483d5d52622e..d69607082893b1e637de6791f86d5b5bdc6688f6 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
+    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:42:65
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:4265
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.6
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cc:7a:bc
-      ip6: fe80::230:48ff:fecc:7abc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.6
+      mac: 00:30:48:cc:7a:bc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cc:7a:bd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:ad:f2
-      ip: 172.17.18.6
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65
+      interface: InfiniBand
+      ip: 172.18.18.6
+      ip6: fe80::230:48ff:ffcc:4265
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: WDC WD2502ABYS-0
       device: sda
-      size: 251059544064
+      model: WDC WD2502ABYS-0
       rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
index 7a802fcc9fbd57815b3c531760d26015ea60ce18..e7631f2b28cf258fff610e348e870123342f7d6e 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-8:
+  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
-      device: sda
-      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:51
-      rate: 40000000000
-      ip6: fe80::230:48ff:ffcc:3d51
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.8
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:30:48:cd:c0:ae
-      ip6: fe80::230:48ff:fecd:c0ae
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.8
+      mac: 00:30:48:cd:c0:ae
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:30:48:cd:c0:af
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:30:48:cc:b6:6d
-      ip: 172.17.18.8
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51
+      interface: InfiniBand
+      ip: 172.18.18.8
+      ip6: fe80::230:48ff:ffcc:3d51
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2502ABYS-0
+      rev: 3.0
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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: 25769803776
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
index 3a490b87ba3846653f409b6893ef5fae488ac296..548d2e3ec382d98c2cd6912e6ff337e4e5de5b46 100644
--- a/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml
@@ -1,71 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 adonis-9:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
+    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:25:90:ff:ff:2f:f1:49
-      rate: 40000000000
-      ip6: fe80::225:90ff:ff2f:f149
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.18.9
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:25:90:4c:e9:84
-      ip6: fe80::225:90ff:fe4c:e984
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.18.9
+      mac: 00:25:90:4c:e9:84
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:25:90:4c:e9:85
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 00:25:90:4b:bd:b1
-      ip: 172.17.18.9
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:25:90:ff:ff:2f:f1:49
+      interface: InfiniBand
+      ip: 172.18.18.9
+      ip6: fe80::225:90ff:ff2f:f149
+      management: false
+      mounted: true
+      rate: 40000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: WDC WD2502ABYS-0
       device: sda
-      size: 251059544064
+      model: WDC WD2502ABYS-0
       rev: 3.0
-      vendor: Western Digital
-  chassis:
-    serial: "1234567890"
-    manufacturer: Bull SAS
-    name: bullx
+      size: 251059544064
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/edel_diff.yaml b/input/grid5000/sites/grenoble/clusters/edel/edel_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6da7355c99811870798d5d953f6b1c364997dd69
--- /dev/null
+++ b/input/grid5000/sites/grenoble/clusters/edel/edel_diff.yaml
@@ -0,0 +1,700 @@
+---
+nodes:
+  edel-[-]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      ib0:
+        enabled: true
+        mountable: true
+      ib1:
+        driver: mlx4_core
+        enabled: false
+        interface: InfiniBand
+        management: false
+        mountable: false
+        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
+
+  edel-10:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.10
+        mac: 08:00:38:35:a3:ca
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab94
+  edel-11:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.11
+        mac: 08:00:38:35:a3:c8
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab90
+  edel-12:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.12
+        mac: 08:00:38:35:a4:1e
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac3c
+  edel-13:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.13
+        mac: 08:00:38:35:a3:ee
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abdc
+  edel-14:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.14
+        mac: 08:00:38:35:a3:d6
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abac
+  edel-15:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.15
+        mac: 08:00:38:35:a3:fe
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abfc
+  edel-16:
+    bios:
+      sdb:
+        device: sdb
+        model: Virtual Floppy
+        rev: 1.0
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.16
+        mac: 08:00:38:36:af:96
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f32c
+      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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+    storage_devices:
+      sdb:
+        device: sdb
+        model: Virtual Floppy
+        rev: 1.0
+  edel-17:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.17
+        mac: 08:00:38:35:a3:cf
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab9e
+  edel-18:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.18
+        mac: 08:00:38:35:a3:c1
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab82
+  edel-19:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.19
+        mac: 08:00:38:35:a3:e8
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+  edel-2:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.2
+        mac: 08:00:38:36:b0:d4
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+      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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+  edel-20:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.20
+        mac: 08:00:38:35:a3:bc
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab78
+  edel-21:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.21
+        mac: 08:00:38:35:a4:25
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac4a
+  edel-22:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.22
+        mac: 08:00:38:35:a3:ce
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab9c
+  edel-23:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.23
+        mac: 08:00:38:35:a3:eb
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abd6
+  edel-24:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.24
+        mac: 08:00:38:35:a4:13
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac26
+  edel-25:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.25
+        mac: 08:00:38:35:a3:5c
+      eth0:
+        ip6: fe80::a00:38ff:fe35:aab8
+  edel-26:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.26
+        mac: 08:00:38:35:a3:aa
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab54
+  edel-27:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.27
+        mac: 08:00:38:35:a4:1f
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+  edel-28:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.28
+        mac: 08:00:38:35:a4:24
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac48
+  edel-29:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.29
+        mac: 08:00:38:35:a3:df
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abbe
+  edel-3:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.3
+        mac: 08:00:38:35:a3:c6
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab8c
+  edel-30:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.30
+        mac: 08:00:38:35:a3:dd
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abba
+  edel-32:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.32
+        mac: 08:00:38:35:a3:a3
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab46
+  edel-34:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.34
+        mac: 08:00:38:35:a3:d1
+      eth0:
+        ip6: fe80::a00:38ff:fe35:aba2
+  edel-35:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.35
+        mac: 08:00:38:35:a3:b1
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab62
+  edel-36:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.3
+        mac: 08:00:38:35:a3:f3
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abe6
+  edel-37:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.37
+        mac: 08:00:38:36:af:83
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f306
+      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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+  edel-38:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.38
+        mac: 08:00:38:35:a3:e9
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abd2
+  edel-39:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.39
+        mac: 08:00:38:35:a4:15
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac2a
+  edel-40:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.40
+        mac: 08:00:38:35:a3:d4
+      eth0:
+        ip6: fe80::a00:38ff:fe35:aba8
+  edel-41:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.41
+        mac: 08:00:38:36:b0:d2
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f5a4
+      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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+  edel-42:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.42
+        mac: 08:00:38:36:9d:ec
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+      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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+  edel-43:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.43
+        mac: 08:00:38:35:a3:ea
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abd4
+  edel-44:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.44
+        mac: 08:00:38:35:a3:d5
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abaa
+  edel-45:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.45
+        mac: 08:00:38:35:a4:11
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+  edel-47:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.47
+        mac: 08:00:38:35:a3:de
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abbc
+  edel-48:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.48
+        mac: 08:00:38:35:a3:b8
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab70
+  edel-49:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.49
+        mac: 08:00:38:35:a3:db
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abb6
+  edel-5:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.5
+        mac: 08:00:38:36:af:9d
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      ib0:
+        driver: mlx4_core
+        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.5
+        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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+  edel-50:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.18.17.50
+        mac: 08:00:38:35:a4:08
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac10
+  edel-51:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.51
+        mac: 08:00:38:35:a4:20
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac40
+  edel-52:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.52
+        mac: 08:00:38:35:a4:0d
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac1a
+  edel-53:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.53
+        mac: 08:00:38:35:a4:1a
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac34
+  edel-55:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.55
+        mac: 08:00:38:35:a3:f4
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abe8
+  edel-56:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.56
+        mac: 08:00:38:35:a4:00
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+  edel-57:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.57
+        mac: 08:00:38:35:a3:d7
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abae
+  edel-58:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.58
+        mac: 08:00:38:35:a4:04
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac08
+  edel-59:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.59
+        mac: 08:00:38:35:a3:ad
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab5a
+  edel-6:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.6
+        mac: 08:00:38:36:ac:2f
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+      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
+        mounted: false
+        rate: 10000000000
+        version: MT26428
+  edel-60:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.60
+        mac: 08:00:38:35:a4:12
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac24
+  edel-62:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.62
+        mac: 08:00:38:35:a3:ed
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abda
+  edel-64:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.64
+        mac: 08:00:38:35:a4:df
+      eth0:
+        ip6: fe80::a00:38ff:fe35:adbe
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+  edel-65:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.65
+        mac: 08:00:38:35:a3:f2
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+  edel-66:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.66
+        mac: 08:00:38:35:a4:0a
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac14
+  edel-67:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.67
+        mac: 08:00:38:35:a3:fd
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abfa
+  edel-68:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.68
+        mac: 08:00:38:35:a3:d8
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abb0
+  edel-69:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.69
+        mac: 08:00:38:35:a4:34
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac68
+  edel-7:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.7
+        mac: 08:00:38:35:a3:a0
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab40
+  edel-70:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.70
+        mac: 08:00:38:35:a4:33
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ac66
+  edel-71:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.71
+        mac: 08:00:38:35:a3:b3
+      eth0:
+        ip6: fe80::a00:38ff:fe36:f33a
+  edel-8:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.8
+        mac: 08:00:38:35:a3:ab
+      eth0:
+        ip6: fe80::a00:38ff:fe35:ab56
+  edel-9:
+    chassis:
+      serial: '123456789'
+    network_adapters:
+      bmc:
+        ip: 172.17.17.9
+        mac: 08:00:38:35:a3:ec
+      eth0:
+        ip6: fe80::a00:38ff:fe35:abd8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
index d19bc9c4f33204c53f80b43c59fcb7fe910433c5..ec38cc0ba73f5bec0cdfc8afaef68cc837bd27ad 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-10:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.10
+      mac: 08:00:38:35:ab:94
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:95
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:5f
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.10
       ip6: fe80::a00:3800:135:c95f
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.10
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:94
-      ip6: fe80::a00:38ff:fe35:ab94
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.10
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ca
-      ip: 172.17.17.10
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  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-11.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
index eba2dd5356378c29a70878a8325af1d9bb82eafb..1afdba8d9dc37897fbbaa3eb7359d539571d4dde 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-11:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.11
+      mac: 08:00:38:35:ab:90
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:91
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:59
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.11
       ip6: fe80::a00:3800:135:c959
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.11
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:90
-      ip6: fe80::a00:38ff:fe35:ab90
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.11
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:c8
-      ip: 172.17.17.11
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   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-12.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
index 051b8c83f96a0eb39551885f8cbf70f16ff65000..62538d5f24d37aed635a4ce361b0b5ba96c966a9 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-12:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.12
+      mac: 08:00:38:35:ac:3c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:3d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5b
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.12
       ip6: fe80::a00:3800:135:ca5b
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.12
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:3c
-      ip6: fe80::a00:38ff:fe35:ac3c
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.12
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1e
-      ip: 172.17.17.12
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-13.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
index 3366a937b563a9113e9da5a40a962f8406979bfb..daaad24dac68d4ed2107045dad36b75a4503b94d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-13:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.13
+      mac: 08:00:38:35:ab:dc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:dd
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:cb
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.13
       ip6: fe80::a00:3800:135:c9cb
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.13
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:dc
-      ip6: fe80::a00:38ff:fe35:abdc
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.13
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ee
-      ip: 172.17.17.13
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       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-14.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
index 415e3c13fd584c20af4b9e541b42d1614b5746d3..768b1ad7da3a9c9affb9426868b0f91173b04e8f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-14:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.14
+      mac: 08:00:38:35:ab:ac
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:ad
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:83
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.14
       ip6: fe80::a00:3800:135:c983
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.14
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:ac
-      ip6: fe80::a00:38ff:fe35:abac
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.14
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d6
-      ip: 172.17.17.14
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-15.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
index 762eb05a2c7d99a1548bb785ab9ed1e8f83e297f..86f93dbd272cd4c5d7fa585a6739a1c5c16daae9 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-15:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.15
+      mac: 08:00:38:35:ab:fc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:fd
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:fb
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.15
       ip6: fe80::a00:3800:135:c9fb
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.15
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:fc
-      ip6: fe80::a00:38ff:fe35:abfc
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.15
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:fe
-      ip: 172.17.17.15
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-16.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
index 5f239c79b75091ea0a17c8cd96dd633635d6439a..875cbdb6e3dcecb35f27ee27ad52df6d28deea0c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.yaml
@@ -1,88 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-16:
+  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
-    sdb:
-      model: Virtual Floppy
-      device: sdb
-      rev: 1.0
-  storage_devices:
-    sda:
-      model: C400-MTFDDAA128M
-      device: sda
-      size: 128035676160
-      rev: 40.0
-    sdb:
-      model: Virtual Floppy
-      device: sdb
-      rev: 1.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:5e:c3
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5ec3
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.16
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:2c
-      ip6: fe80::a00:38ff:fe36:f32c
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.16
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:f3:2c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:f3:2d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:c3
       interface: InfiniBand
+      ip: 172.18.17.16
+      ip6: fe80::a00:3800:137:5ec3
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:96
-      ip: 172.17.17.16
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-17.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
index 2be5579edb176605bc8abfa80ac13221f9c560ad..c4f91721385fe9159df151ed2c3c3ba855e8a856 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-17:
+  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: C300-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 7.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.17
+      mac: 08:00:38:35:ab:9e
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:9f
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6e
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.17
       ip6: fe80::a00:3800:135:c96e
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.17
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:9e
-      ip6: fe80::a00:38ff:fe35:ab9e
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.17
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:9f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:cf
-      ip: 172.17.17.17
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C300-MTFDDAA064M
+      rev: 7.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-18.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
index 7d8665749f1b60bf4daa46ac5c9ac36b962ec480..470119bb704851bb6ef01d482070a5d24546eca5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-18:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.18
+      mac: 08:00:38:35:ab:82
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:83
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:44
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.18
       ip6: fe80::a00:3800:135:c944
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.18
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:82
-      ip6: fe80::a00:38ff:fe35:ab82
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.18
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:83
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:c1
-      ip: 172.17.17.18
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  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-19.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
index 3369d5eb2ea70648f1e451fdcb3e15b5b3e5de14..cff2a73c7334f4e450c4d7fb3f1666eefefad1db 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-19:
+  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:c9:b9
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.19
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d0
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.19
-      driver: igb
-      mountable: true
+      mac: 08:00:38:35:ab:d0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:35:ab:d1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:b9
       interface: InfiniBand
+      ip: 172.18.17.19
+      ip6: fe80::a00:3800:135:c9b9
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:e8
-      ip: 172.17.17.19
+      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
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-2.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
index 95e5bb2f2cbba7443e90e237540366712c34840c..b08c4f505a7d61528ed48104590a838409aba711 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.yaml
@@ -1,80 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-2:
+  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:62:7d
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:627d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.2
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f5:a8
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.2
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:f5:a8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:f5:a9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:62:7d
       interface: InfiniBand
+      ip: 172.18.17.2
+      ip6: fe80::a00:3800:137:627d
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:b0:d4
-      ip: 172.17.17.2
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
       size: 64023257088
-      rev: 40
   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-20.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
index 7d6ab7de17754a16bb1de00273b54b63c8523ca7..733f600d4c003b6ed754b493378617804bdbd6b2 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-20:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.20
+      mac: 08:00:38:35:ab:78
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:79
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:35
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.20
       ip6: fe80::a00:3800:135:c935
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.20
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:78
-      ip6: fe80::a00:38ff:fe35:ab78
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.20
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:bc
-      ip: 172.17.17.20
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 64023257088
   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-21.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
index 57b7c2024f2fcd0e81579e61bfb0a48900701153..5538907513cd4d0c373e673d6dcdf66de3fa6ce2 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-21:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.21
+      mac: 08:00:38:35:ac:4a
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:4b
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:70
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.21
       ip6: fe80::a00:3800:135:ca70
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.21
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:4a
-      ip6: fe80::a00:38ff:fe35:ac4a
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.21
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:4b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:25
-      ip: 172.17.17.21
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-22.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
index d9c725e41b9549934e8768f75d2b1441aca986a0..1a3b08bf92773f3ffd6c49c1e31ea8cea1e1fac3 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-22:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.22
+      mac: 08:00:38:35:ab:9c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:9d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:6b
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.22
       ip6: fe80::a00:3800:135:c96b
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.22
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:9c
-      ip6: fe80::a00:38ff:fe35:ab9c
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.22
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ce
-      ip: 172.17.17.22
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      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-23.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
index d8dce4067368a6e92453c40964d888a95c68a88a..4afa263e15e325f9dc2f806f56520b1830d723e0 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-23:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.23
+      mac: 08:00:38:35:ab:d6
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:d7
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c2
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.23
       ip6: fe80::a00:3800:135:c9c2
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.23
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d6
-      ip6: fe80::a00:38ff:fe35:abd6
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.23
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:eb
-      ip: 172.17.17.23
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-24.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
index cf67847074b5c1c286aabf1848546b011f713ce5..3983dba51edcb4bd950974f878bfa719451a8e19 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-24:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.24
+      mac: 08:00:38:35:ac:26
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:27
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:3a
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.24
       ip6: fe80::a00:3800:135:ca3a
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.24
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:26
-      ip6: fe80::a00:38ff:fe35:ac26
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.24
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:27
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:13
-      ip: 172.17.17.24
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      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-25.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
index 92f53849983f21942893c2d9931dafdf7def13c5..f434988e2f8b677d818d4419c3e9e831e7664549 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-25:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.25
+      mac: 08:00:38:35:aa:b8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:aa:b9
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:15
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.25
       ip6: fe80::a00:3800:135:c815
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.25
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:aa:b8
-      ip6: fe80::a00:38ff:fe35:aab8
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.25
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:aa:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:5c
-      ip: 172.17.17.25
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      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-26.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
index 4389e17746da06097192e2326682ceb923ae0f4f..38727881cf76c4679f8c429c0f69847059995e9d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-26:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.26
+      mac: 08:00:38:35:ab:54
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:55
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ff
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.26
       ip6: fe80::a00:3800:135:c8ff
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.26
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:54
-      ip6: fe80::a00:38ff:fe35:ab54
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.26
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:aa
-      ip: 172.17.17.26
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   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-27.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
index da1022a0c76b4ee98486376a9f33798c6da83ca1..d609add1b45c3c22f14522f86254a4cc67a8fb1f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 12/20/2010
     vendor: INSYDE
     version: Thurley.3.59.48.0028_BUILD_NCB_N0017
+  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:5e
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca5e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.27
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:3e
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.27
-      driver: igb
-      mountable: true
+      mac: 08:00:38:35:ac:3e
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:35:ac:3f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:5e
       interface: InfiniBand
+      ip: 172.18.17.27
+      ip6: fe80::a00:3800:135:ca5e
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1f
-      ip: 172.17.17.27
+      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
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-28.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
index ba7353d98b45319dcc2496a0b84f70eaa483a033..20012e888a14f584e8fc78a8c13175b2e1086bff 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-28:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.28
+      mac: 08:00:38:35:ac:48
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:49
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:6d
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.28
       ip6: fe80::a00:3800:135:ca6d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.28
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:48
-      ip6: fe80::a00:38ff:fe35:ac48
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.28
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:24
-      ip: 172.17.17.28
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-29.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
index ebea7897505ca24680bc894f4a70b9e8c3fdcfef..251de4389428d6cb37f7738f929002a7dfb3cfcc 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-29:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.29
+      mac: 08:00:38:35:ab:be
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:bf
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9e
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.29
       ip6: fe80::a00:3800:135:c99e
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.29
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:be
-      ip6: fe80::a00:38ff:fe35:abbe
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.29
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:df
-      ip: 172.17.17.29
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-3.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
index 23f9ce905476161365880670b2ec6d14b135e76e..ba7ec52305136e47e59bda962f5add854dd89c93 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-3:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.3
+      mac: 08:00:38:35:ab:8c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:8d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:53
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.3
       ip6: fe80::a00:3800:135:c953
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.3
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:8c
-      ip6: fe80::a00:38ff:fe35:ab8c
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.3
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:c6
-      ip: 172.17.17.3
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       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-30.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
index 2463e9900bdc453558d6b02c66b0f065a79e0d40..4fd90731edf40b3998a6fe4a13f78a1c3ba8f529 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-30:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.30
+      mac: 08:00:38:35:ab:ba
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:bb
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:98
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.30
       ip6: fe80::a00:3800:135:c998
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.30
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:ba
-      ip6: fe80::a00:38ff:fe35:abba
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.30
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:bb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:dd
-      ip: 172.17.17.30
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      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-32.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
index 84c8b4cec1c68698fef9164b9a63ee82be44e186..d97316b6e0e48548d67c3f7146554613b8ec59c8 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-32:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.32
+      mac: 08:00:38:35:ab:46
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:47
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:ea
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.32
       ip6: fe80::a00:3800:135:c8ea
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.32
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:46
-      ip6: fe80::a00:38ff:fe35:ab46
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.32
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:47
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:a3
-      ip: 172.17.17.32
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      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-34.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
index 93a970dc76dcc24cb31503e1f978320c7bcb8dfa..30185fcead6c2f90af010a4dc38ee79e96b84b8c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-34:
+  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: C300-MTFDDAA064M
-      device: sda
-      size: 64023257088
-      rev: 7.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.34
+      mac: 08:00:38:35:ab:a2
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:a3
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:74
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.34
       ip6: fe80::a00:3800:135:c974
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.34
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:a2
-      ip6: fe80::a00:38ff:fe35:aba2
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.34
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:a3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d1
-      ip: 172.17.17.34
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C300-MTFDDAA064M
+      rev: 7.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-35.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
index 898904298371283cf60453601b6ea50db2d2f653..5ba665fd82e85805f5b77414236368d000d8246e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-35:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.35
+      mac: 08:00:38:35:ab:62
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:63
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:14
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.35
       ip6: fe80::a00:3800:135:c914
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.35
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:62
-      ip6: fe80::a00:38ff:fe35:ab62
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.35
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:63
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:b1
-      ip: 172.17.17.35
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      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-36.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
index 2aba1938bbf78a11fc9aceead8d9cc86a8eee0f9..4893cea43a8a8b1496a89fe357f87d75ea2d4ae2 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-36:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.36
+      mac: 08:00:38:35:ab:e6
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:e7
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:da
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.36
       ip6: fe80::a00:3800:135:c9da
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.36
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:e6
-      ip6: fe80::a00:38ff:fe35:abe6
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.36
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:e7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:f3
-      ip: 172.17.17.3
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   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-37.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
index 8e421fbd08e2a6a6f9d1ec0cfd2efca34ded3dd3..e8878f87bc07d3e6a6c729cdf8b15a3d2d9705bd 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.yaml
@@ -1,80 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-37:
+  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
-      device: sda
-      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:5e:8a
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:5e8a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.37
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:06
-      ip6: fe80::a00:38ff:fe36:f306
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.37
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:f3:06
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:f3:07
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:5e:8a
       interface: InfiniBand
+      ip: 172.18.17.37
+      ip6: fe80::a00:3800:137:5e8a
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:83
-      ip: 172.17.17.37
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-38.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
index 7077ca885eedb0e14e2df0a71ee996091336b105..08ab8f3ebc086249df7e2032630b46259bc7b054 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-38:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.38
+      mac: 08:00:38:35:ab:d2
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:d3
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bc
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.38
       ip6: fe80::a00:3800:135:c9bc
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.38
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d2
-      ip6: fe80::a00:38ff:fe35:abd2
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.38
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:d3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:e9
-      ip: 172.17.17.38
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  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-39.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
index 1432e88d16e1ea57a5b5c569f335cc5ad8f84be4..58d9d9b1f2ae8f33e3eaf172ec5180de5e93ae7c 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-39:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.39
+      mac: 08:00:38:35:ac:2a
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:2b
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:40
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.39
       ip6: fe80::a00:3800:135:ca40
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.39
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:2a
-      ip6: fe80::a00:38ff:fe35:ac2a
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.39
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:15
-      ip: 172.17.17.39
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      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-40.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
index a116c95b06b8acad1769a3852e89300450f1e236..d4e92bec271c8994a5bd1c97e901da060872ca0d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-40:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.40
+      mac: 08:00:38:35:ab:a8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:a9
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:7d
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.40
       ip6: fe80::a00:3800:135:c97d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.40
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:a8
-      ip6: fe80::a00:38ff:fe35:aba8
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.40
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d4
-      ip: 172.17.17.40
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-41.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
index 31dc4aed1ee758fb68ffa365726c9a2e1e1ed9bb..471c61b47686bf01316b7fb335d5bdfc6802d953 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.yaml
@@ -1,80 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-41:
+  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:62:77
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:6277
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.41
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f5:a4
-      ip6: fe80::a00:38ff:fe36:f5a4
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.41
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:f5:a4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:f5:a5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:62:77
       interface: InfiniBand
+      ip: 172.18.17.41
+      ip6: fe80::a00:3800:137:6277
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:b0:d2
-      ip: 172.17.17.41
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-42.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
index f42c30a6eadc8de505c56c39efaab43558524899..5813be57765004d11e0cb182a98aa19e2646b351 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.yaml
@@ -1,80 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-42:
+  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:29:c5
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:29c5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.42
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:cf:d8
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.42
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:cf:d8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:cf:d9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:29:c5
       interface: InfiniBand
+      ip: 172.18.17.42
+      ip6: fe80::a00:3800:137:29c5
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:9d:ec
-      ip: 172.17.17.42
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-43.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
index 889a82e716eed6777426f8eb0ff6ca0c277b1731..456e0e810cb87079becfaa49365be0b095e2ba90 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-43:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.43
+      mac: 08:00:38:35:ab:d4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:d5
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:bf
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.43
       ip6: fe80::a00:3800:135:c9bf
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.43
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d4
-      ip6: fe80::a00:38ff:fe35:abd4
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.43
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ea
-      ip: 172.17.17.43
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-44.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
index bd79d111405b4a68eee55e6e38e16310fe2a2fa8..78f8f4bcc1ecfaee5d339a52d1d0d6793edc6129 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-44:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.44
+      mac: 08:00:38:35:ab:aa
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:ab
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:80
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.44
       ip6: fe80::a00:3800:135:c980
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.44
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:aa
-      ip6: fe80::a00:38ff:fe35:abaa
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.44
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:ab
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d5
-      ip: 172.17.17.44
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-45.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
index c93bde8485987101bfe47ebe6eba5ae0dbe27e17..6736a1706262b839924258e7ff3b26a2d74d6988 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-45:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
     release_date: 12/20/2010
     vendor: INSYDE
     version: Thurley.3.59.48.0028_BUILD_NCB_N0017
+  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:34
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca34
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.45
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:22
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.45
-      driver: igb
-      mountable: true
+      mac: 08:00:38:35:ac:22
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:35:ac:23
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:34
       interface: InfiniBand
+      ip: 172.18.17.45
+      ip6: fe80::a00:3800:135:ca34
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:11
-      ip: 172.17.17.45
+      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
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-47.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
index d8e9d6bf799882f992b7ad9d028b0d28958c550f..31e9139217edc7382227756d9739124609bbb5ad 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-47:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.47
+      mac: 08:00:38:35:ab:bc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:bd
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:9b
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.47
       ip6: fe80::a00:3800:135:c99b
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.47
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:bc
-      ip6: fe80::a00:38ff:fe35:abbc
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.47
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:de
-      ip: 172.17.17.47
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   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-48.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
index b28e66e9d3ff7543d76edacd3ed67b8f5ca359d3..747120bc6d1359562613a28e8b54fb63fbc13ba5 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-48:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.48
+      mac: 08:00:38:35:ab:70
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:71
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:29
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.48
       ip6: fe80::a00:3800:135:c929
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.48
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:70
-      ip6: fe80::a00:38ff:fe35:ab70
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.48
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:b8
-      ip: 172.17.17.48
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      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-49.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
index 05eba1da064e6fc51c542d067cc7bd74f0c5938e..d71560b24f1535ade28cf380b18fff5d3edb1548 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-49:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.49
+      mac: 08:00:38:35:ab:b6
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:b7
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:92
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.49
       ip6: fe80::a00:3800:135:c992
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.49
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:b6
-      ip6: fe80::a00:38ff:fe35:abb6
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.49
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:b7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:db
-      ip: 172.17.17.49
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-5.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
index 0d865495ebff1f167d4af918b0028216fd2c3a74..a13e24c85af1a9a87fb768faaf7deb84833a5b41 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.yaml
@@ -1,80 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-5:
+  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.5
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:f3:3a
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.5
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:f3:3a
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:f3:3b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
-      interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:af:9d
-      ip: 172.17.17.5
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-50.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
index ccadfa4dcedd514490d0124474fc804c0bd5d8ee..d8c392b9d73db79283657f16ff135f0b3df1bd27 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-50:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.50
+      mac: 08:00:38:35:ac:10
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:11
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:19
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.50
       ip6: fe80::a00:3800:135:ca19
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.50
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:10
-      ip6: fe80::a00:38ff:fe35:ac10
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.50
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:08
-      ip: 172.18.17.50
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      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-51.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
index c75b167007f1d04dcc8bca448380e20329807fb6..e7fcb89dcf03cbfc24307b8de682c9320238c461 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-51:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.51
+      mac: 08:00:38:35:ac:40
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:41
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:61
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.51
       ip6: fe80::a00:3800:135:ca61
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.51
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:40
-      ip6: fe80::a00:38ff:fe35:ac40
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.51
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:20
-      ip: 172.17.17.51
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  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-52.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
index 10577f4f41ed8ceb4dd033594b8b3cf5132420d1..61e2eb6683c91e7ab644a948da3a3197c32b7e35 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-52:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.52
+      mac: 08:00:38:35:ac:1a
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:1b
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:28
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.52
       ip6: fe80::a00:3800:135:ca28
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.52
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:1a
-      ip6: fe80::a00:38ff:fe35:ac1a
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.52
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:1b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:0d
-      ip: 172.17.17.52
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      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-53.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
index eeb6f39bc07086765ada05578f1580042c3cc485..3d9f6ed60a993ec1aa443d2c6455242bba08cb1f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-53:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.53
+      mac: 08:00:38:35:ac:34
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:35
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:4f
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.53
       ip6: fe80::a00:3800:135:ca4f
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.53
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:34
-      ip6: fe80::a00:38ff:fe35:ac34
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.53
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:1a
-      ip: 172.17.17.53
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA064M
       device: sda
-      size: 64023257088
+      model: C400-MTFDDAA064M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 64023257088
   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-55.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
index ba0aba08a5bf8cc62a75f8f9d632de451df4fefe..85b594ca7552eb48baba877a95ad1943a0c6a244 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-55:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.55
+      mac: 08:00:38:35:ab:e8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:e9
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:dd
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.55
       ip6: fe80::a00:3800:135:c9dd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.55
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:e8
-      ip6: fe80::a00:38ff:fe35:abe8
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.55
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:f4
-      ip: 172.17.17.55
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-56.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
index 5e2da0f3014bbb94450cc5ac36b285d3e11ecbde..88a3b395365125754dac6555e60cec0fd77a7ff8 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-56:
+  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:01
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:ca01
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.56
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:00
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.56
-      driver: igb
-      mountable: true
+      mac: 08:00:38:35:ac:00
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:35:ac:01
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:01
       interface: InfiniBand
+      ip: 172.18.17.56
+      ip6: fe80::a00:3800:135:ca01
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:00
-      ip: 172.17.17.56
+      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
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-57.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
index 581817d107c14aaa89ac8de3abb21a0f1773121d..f4a51469d8b0dc00214c2f095bef394886eec440 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-57:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.57
+      mac: 08:00:38:35:ab:ae
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:af
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:86
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.57
       ip6: fe80::a00:3800:135:c986
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.57
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:ae
-      ip6: fe80::a00:38ff:fe35:abae
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.57
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:af
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d7
-      ip: 172.17.17.57
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-58.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
index 7dc4b3002519eaf2fb503c6836e2897a67c6e7a8..32b05a2beeecb2165323209fa10c965bd6be603a 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-58:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.58
+      mac: 08:00:38:35:ac:08
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:09
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:0d
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.58
       ip6: fe80::a00:3800:135:ca0d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.58
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:08
-      ip6: fe80::a00:38ff:fe35:ac08
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.58
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:04
-      ip: 172.17.17.58
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-59.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
index e77e2ddd97922dd1599776d244473f85a4c8aa83..838750a266ed98ca1f764a4b3dc87d5a6611257a 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-59:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.59
+      mac: 08:00:38:35:ab:5a
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:5b
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:08
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.59
       ip6: fe80::a00:3800:135:c908
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.59
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:5a
-      ip6: fe80::a00:38ff:fe35:ab5a
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.59
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:5b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ad
-      ip: 172.17.17.59
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-6.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
index 92936cab75fb119ee2ebb6dda71bfd8d066d7457..34ec8d813f93ad564eced1edd4ba622cfe7c6ebb 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.yaml
@@ -1,80 +1,50 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-6:
+  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:54:8e
-      rate: 40000000000
-      ip6: fe80::a00:3800:137:548e
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.6
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:36:ec:5e
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.6
-      driver: igb
-      mountable: true
+      mac: 08:00:38:36:ec:5e
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:36:ec:5f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:37:54:8e
       interface: InfiniBand
+      ip: 172.18.17.6
+      ip6: fe80::a00:3800:137:548e
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:36:ac:2f
-      ip: 172.17.17.6
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-60.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
index 079004877b0da6796f07c497819b77f84b709e05..481367e6e47bd4c3103798692ba5479216525f0f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-60:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.60
+      mac: 08:00:38:35:ac:24
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:25
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:37
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.60
       ip6: fe80::a00:3800:135:ca37
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.60
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:24
-      ip6: fe80::a00:38ff:fe35:ac24
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.60
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:12
-      ip: 172.17.17.60
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-62.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
index 193f7fd9b18f6ee04a865572d698f6aef41ecb1c..fdaeeaa5a288d5054ca397cb0dcc69a03e350e1f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-62:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.62
+      mac: 08:00:38:35:ab:da
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:db
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c8
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.62
       ip6: fe80::a00:3800:135:c9c8
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.62
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:da
-      ip6: fe80::a00:38ff:fe35:abda
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.62
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:db
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ed
-      ip: 172.17.17.62
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       rev: 40.0
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-64.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
index 9fc31b99d417d116859e1f199985ef5117e44e8c..c5e2a393302291b3da57241a94045fcc7d69a485 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.yaml
@@ -1,84 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-64:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.64
+      mac: 08:00:38:35:ad:be
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ad:bf
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:cc:9e
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.64
       ip6: fe80::a00:3800:135:cc9e
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.64
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ad:be
-      ip6: fe80::a00:38ff:fe35:adbe
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.64
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ad:bf
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:df
-      ip: 172.17.17.64
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2270000000
-    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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
index 48d4460b3e87e2b2495cd91dd9e7a5255e933556..7a7832254fc4adf411e2a910ee27d91812a730a4 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-65:
+  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:c9:d7
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c9d7
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.65
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:e4
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.65
-      driver: igb
-      mountable: true
+      mac: 08:00:38:35:ab:e4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:35:ab:e5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:d7
       interface: InfiniBand
+      ip: 172.18.17.65
+      ip6: fe80::a00:3800:135:c9d7
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:f2
-      ip: 172.17.17.65
+      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
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-66.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
index 5b3f03bbae75d71826a86fdcf540172c60d3c685..bf7b976083073bb9a782094e4fb1035eb1f8220e 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-66:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.66
+      mac: 08:00:38:35:ac:14
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:15
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:1f
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.66
       ip6: fe80::a00:3800:135:ca1f
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.66
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:14
-      ip6: fe80::a00:38ff:fe35:ac14
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.66
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:0a
-      ip: 172.17.17.66
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-67.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
index ec5f5a8d9fabb85b56f17dea975f7bfa75112f8c..fee983b2640a6b06d0f55a8ce53375d1e0034a62 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-67:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.67
+      mac: 08:00:38:35:ab:fa
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:fb
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:f8
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.67
       ip6: fe80::a00:3800:135:c9f8
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.67
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:fa
-      ip6: fe80::a00:38ff:fe35:abfa
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.67
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:fb
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:fd
-      ip: 172.17.17.67
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
-  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-68.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
index 82a6aea54756934d117bf4b78fab98f64e4a8e50..1f906e91ed463995e0f358cc8828bf3e72df543f 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-68:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.68
+      mac: 08:00:38:35:ab:b0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:b1
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:89
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.68
       ip6: fe80::a00:3800:135:c989
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.68
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:b0
-      ip6: fe80::a00:38ff:fe35:abb0
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.68
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:d8
-      ip: 172.17.17.68
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-69.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
index 9bb204a9f9f75dc58a6ac8980f1d8e85e434da8a..3dcd287a8b011349b5980d9372b75f4e4b018e36 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-69:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.69
+      mac: 08:00:38:35:ac:68
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:69
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9d
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.69
       ip6: fe80::a00:3800:135:ca9d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.69
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:68
-      ip6: fe80::a00:38ff:fe35:ac68
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.69
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:34
-      ip: 172.17.17.69
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      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-7.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
index 0c4eb8e4df971c451598ed49ee1065e4144b861d..925433de59953661cfbd1ad02e82c2cda7716aeb 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-7:
+  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
-      device: sda
-      size: 64023257088
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.7
+      mac: 08:00:38:35:ab:40
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:41
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c8:e1
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.7
       ip6: fe80::a00:3800:135:c8e1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.7
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:40
-      ip6: fe80::a00:38ff:fe35:ab40
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.7
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:a0
-      ip: 172.17.17.7
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA064M
+      rev: 40.0
+      size: 64023257088
   supported_job_types:
     virtual: ivt
-  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-70.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
index 0585d33ba10c1ceb712fbbb70cc69a725620d52f..db4d6b668bfbb7abacd6c443891bc27d9f53cb6d 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-70:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.70
+      mac: 08:00:38:35:ac:66
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ac:67
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:ca:9a
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.70
       ip6: fe80::a00:3800:135:ca9a
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.70
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ac:66
-      ip6: fe80::a00:38ff:fe35:ac66
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.70
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ac:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a4:33
-      ip: 172.17.17.70
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      size: 128035676160
   supported_job_types:
     virtual: ivt
-  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-71.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
index 3ca8e8b376810c31f65e4dc47706b78149bfb4c0..065295a0d6bbed26d499b2b471e340ed8f0b5901 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-71:
+  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:c9:1a
-      rate: 40000000000
-      ip6: fe80::a00:3800:135:c91a
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26428
-      ip: 172.18.17.71
-      driver: mlx4_core
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:66
-      ip6: fe80::a00:38ff:fe36:f33a
-      management: false
-      enabled: true
+      driver: igb
       interface: Ethernet
       ip: 172.16.17.71
-      driver: igb
-      mountable: true
+      mac: 08:00:38:35:ab:66
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 08:00:38:35:ab:67
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      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
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:1a
       interface: InfiniBand
+      ip: 172.18.17.71
+      ip6: fe80::a00:3800:135:c91a
+      management: false
+      mounted: true
+      rate: 40000000000
       version: MT26428
+    ib1:
       driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:b3
-      ip: 172.17.17.71
+      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
+      mounted: false
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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-8.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
index b5ee86f21166f63d78757fc4572a8e93355f0dd0..a999df8ca9bdda78e8690a7b3ac23b13973cf7af 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-8:
+  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
-      device: sda
-      size: 128035676160
-      rev: 40.0
+  chassis:
+    manufacturer: INSYDE
+    name: Thurley
+    serial: 123456789
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.8
+      mac: 08:00:38:35:ab:56
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:57
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:02
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.8
       ip6: fe80::a00:3800:135:c902
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.8
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:56
-      ip6: fe80::a00:38ff:fe35:ab56
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.8
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:57
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ab
-      ip: 172.17.17.8
-  chassis:
-    serial: "123456789"
-    manufacturer: INSYDE
-    name: Thurley
+      rate: 10000000000
+      version: MT26428
+  storage_devices:
+    sda:
+      device: sda
+      model: C400-MTFDDAA128M
+      rev: 40.0
+      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-9.yaml b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
index 6eb1759a5968fdcf9c63e24e4a484e4464cd2222..68a7c92b5c61a6b2af7cca30a648b1bc4fa8e0dd 100644
--- a/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.yaml
@@ -1,80 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 edel-9:
+  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:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.17.9
+      mac: 08:00:38:35:ab:d8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 08:00:38:35:ab:d9
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:08:00:38:00:01:35:c9:c5
-      rate: 40000000000
+      interface: InfiniBand
+      ip: 172.18.17.9
       ip6: fe80::a00:3800:135:c9c5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 40000000000
       version: MT26428
-      ip: 172.18.17.9
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       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
       interface: InfiniBand
-      version: MT26428
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 08:00:38:35:ab:d8
-      ip6: fe80::a00:38ff:fe35:abd8
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.17.9
-      driver: igb
-      mountable: true
-    eth1:
       mounted: false
-      mac: 08:00:38:35:ab:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 08:00:38:35:a3:ec
-      ip: 172.17.17.9
+      rate: 10000000000
+      version: MT26428
   storage_devices:
     sda:
-      model: C400-MTFDDAA128M
       device: sda
-      size: 128035676160
+      model: C400-MTFDDAA128M
       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/lille/clusters/chimint/chimint_diff.yaml b/input/grid5000/sites/lille/clusters/chimint/chimint_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e25872dc4cd0fa917244e5046f003139c6b8b31c
--- /dev/null
+++ b/input/grid5000/sites/lille/clusters/chimint/chimint_diff.yaml
@@ -0,0 +1,239 @@
+---
+nodes:
+  chimint-[1-20]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: true
+        mountable: true
+        rate: 1000000000
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 12582912
+      clock_speed: 2400000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+      vendor: Intel
+      version: E5620
+    storage_devices:
+      sda:
+        vendor: DELL
+  chimint-1:
+    chassis:
+      serial: DQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.101
+        mac: 84:2b:2b:72:d4:81
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d47f
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d480
+  chimint-10:
+    chassis:
+      serial: 9QM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.110
+        mac: 84:2b:2b:72:d4:4b
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d449
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d44a
+  chimint-11:
+    chassis:
+      serial: BRM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.111
+        mac: 84:2b:2b:70:c9:9f
+      eth0:
+        ip6: fe80::862b:2bff:fe70:c99d
+      eth1:
+        ip6: fe80::862b:2bff:fe70:c99e
+  chimint-12:
+    chassis:
+      serial: BQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.112
+        mac: 84:2b:2b:72:d5:ec
+      eth0:
+        ip6: fe80::862b:2bff:fe70:c621
+      eth1:
+        ip6: fe80::862b:2bff:fe70:c622
+  chimint-14:
+    chassis:
+      serial: CQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.114
+        mac: 84:2b:2b:72:d5:69
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d567
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d568
+  chimint-15:
+    chassis:
+      serial: HQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.115
+        mac: 84:2b:2b:72:d7:7c
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d77a
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d77b
+  chimint-16:
+    chassis:
+      serial: JQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.116
+        mac: 84:2b:2b:72:d5:dd
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d5db
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d5dc
+  chimint-17:
+    chassis:
+      serial: 8QM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.117
+        mac: 84:2b:2b:70:f6:94
+      eth0:
+        ip6: fe80::862b:2bff:fe70:f692
+      eth1:
+        ip6: fe80::862b:2bff:fe70:f693
+  chimint-18:
+    chassis:
+      serial: GQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.118
+        mac: 84:2b:2b:72:d7:8b
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d789
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d78a
+  chimint-19:
+    chassis:
+      serial: 1RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.119
+        mac: 84:2b:2b:70:c6:23
+      eth0:
+        ip6: fe80::862b:2bff:fe70:c621
+      eth1:
+        ip6: fe80::862b:2bff:fe70:c622
+  chimint-2:
+    chassis:
+      serial: 8RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.102
+        mac: 84:2b:2b:70:4f:4e
+      eth0:
+        ip6: fe80::862b:2bff:fe70:4f4c
+      eth1:
+        ip6: fe80::862b:2bff:fe70:4f4d
+  chimint-20:
+    chassis:
+      serial: 7RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.120
+        mac: 84:2b:2b:70:c3:d7
+      eth0:
+        ip6: fe80::862b:2bff:fe70:c3d5
+      eth1:
+        ip6: fe80::862b:2bff:fe70:c3d6
+  chimint-3:
+    chassis:
+      serial: 2RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.103
+        mac: 84:2b:2b:70:4e:20
+      eth0:
+        ip6: fe80::862b:2bff:fe70:c621
+      eth1:
+        ip6: fe80::862b:2bff:fe70:c622
+  chimint-4:
+    chassis:
+      serial: 3RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.104
+        mac: 84:2b:2b:48:31:45
+      eth0:
+        ip6: fe80::862b:2bff:fe48:3143
+      eth1:
+        ip6: fe80::862b:2bff:fe48:3144
+  chimint-5:
+    chassis:
+      serial: 6RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.105
+        mac: 84:2b:2b:70:cc:94
+      eth0:
+        ip6: fe80::862b:2bff:fe70:cc92
+      eth1:
+        ip6: fe80::862b:2bff:fe70:cc93
+  chimint-6:
+    chassis:
+      serial: FQM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.106
+        mac: 84:2b:2b:72:d5:a0
+      eth0:
+        ip6: fe80::862b:2bff:fe72:d59e
+      eth1:
+        ip6: fe80::862b:2bff:fe72:d59f
+  chimint-7:
+    chassis:
+      serial: 5RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.107
+        mac: 84:2b:2b:72:b3:46
+      eth0:
+        ip6: fe80::862b:2bff:fe72:b344
+      eth1:
+        ip6: fe80::862b:2bff:fe72:b345
+  chimint-8:
+    chassis:
+      serial: CRM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.108
+        mac: 84:2b:2b:72:da:c5
+      eth0:
+        ip6: fe80::862b:2bff:fe72:dac3
+      eth1:
+        ip6: fe80::862b:2bff:fe72:dac4
+  chimint-9:
+    chassis:
+      serial: 4RM1Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.33.109
+        mac: 84:2b:2b:72:cb:e5
+      eth0:
+        ip6: fe80::862b:2bff:fe70:c621
+      eth1:
+        ip6: fe80::862b:2bff:fe70:c622
+
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
index 8c9546da147f4d444bdbe41d0a3eb262d13b195d..284d03c5b9feca32e41656e8f0ffd2659b0a39fa 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: DQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d4:7f
-      ip6: fe80::862b:2bff:fe72:d47f
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.1
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d4:7f
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d4:80
-      ip6: fe80::862b:2bff:fe72:d480
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d4:81
-      ip: 172.17.33.101
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: DQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
index ef64ae8a20badf5a2179da926e524bb78bbc6c01..6752d27e66ea32ce38c2f7bd95e3b64dde8f6269 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-10:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 9QM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d4:49
-      ip6: fe80::862b:2bff:fe72:d449
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.10
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d4:49
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d4:4a
-      ip6: fe80::862b:2bff:fe72:d44a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d4:4b
-      ip: 172.17.33.110
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 9QM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
index a849863488a55aa4ae92756f84ff2e35371dd2b9..ecae66253da45f5bab3ef57d6ea663b71d73ff0a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: BRM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:c9:9d
-      ip6: fe80::862b:2bff:fe70:c99d
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.11
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:70:c9:9d
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:c9:9e
-      ip6: fe80::862b:2bff:fe70:c99e
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:c9:9f
-      ip: 172.17.33.111
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: BRM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-12.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
index 10dd629dd6f9391bd94c20ac66505ed6bc436a4f..62268798c494832074a3bc729e58d29b42e8ebfe 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-12:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: BQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:ea
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.12
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d5:ea
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d5:eb
-      ip6: fe80::862b:2bff:fe70:c622
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:ec
-      ip: 172.17.33.112
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: BQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
index b408d0cb733fd3153801cf5009e77a350e76da53..a90ee4ce3d8c65d6ba9d028178daa34eacca2807 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: CQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:67
-      ip6: fe80::862b:2bff:fe72:d567
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.14
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d5:67
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d5:68
-      ip6: fe80::862b:2bff:fe72:d568
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:69
-      ip: 172.17.33.114
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: CQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-15.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
index aab932f7294ada0aecff898e46a06f8c84f097f5..7756973cff7c72693e1b26d045f05cebf3bc222a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: HQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d7:7a
-      ip6: fe80::862b:2bff:fe72:d77a
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.15
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d7:7a
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d7:7b
-      ip6: fe80::862b:2bff:fe72:d77b
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d7:7c
-      ip: 172.17.33.115
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: HQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
index a5a1d2a09b27e2e0685fd0cc082bb07e374a2e65..a1f807540db9b7aa646c8a4d74a47488fe31822c 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-16:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: JQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:db
-      ip6: fe80::862b:2bff:fe72:d5db
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.16
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d5:db
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d5:dc
-      ip6: fe80::862b:2bff:fe72:d5dc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:dd
-      ip: 172.17.33.116
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: JQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-17.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
index 12263e42e43f74ee40db06dd553d8880a7a9ad34..ee74fef03e85850277f0d7c7b0da66f45a593b5e 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-17:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 8QM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:f6:92
-      ip6: fe80::862b:2bff:fe70:f692
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.17
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:70:f6:92
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:f6:93
-      ip6: fe80::862b:2bff:fe70:f693
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:f6:94
-      ip: 172.17.33.117
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 8QM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
index 5095b4c735d21cdcf76ce720ebf6708b88b6ae86..1a2ce0333487f192467c52863eec6ee6097adbdc 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-18:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: GQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d7:89
-      ip6: fe80::862b:2bff:fe72:d789
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.18
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d7:89
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d7:8a
-      ip6: fe80::862b:2bff:fe72:d78a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d7:8b
-      ip: 172.17.33.118
-  chassis:
-    serial: GQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-19.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
index e590f4facda167f9b62164b25aa9e3f0a79b534f..161db81241e346670dc70457683fa19f848e9aa2 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-19:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 1RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:c6:21
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.19
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:70:c6:21
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:c6:22
-      ip6: fe80::862b:2bff:fe70:c622
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:c6:23
-      ip: 172.17.33.119
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 1RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
index 00c31e433b7f61b75e1868cd4b84b81dd9d63c6a..b95570a5281ad9e6534fd64ffb3da824fbcb1b50 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 8RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:4f:4c
-      ip6: fe80::862b:2bff:fe70:4f4c
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.2
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:70:4f:4c
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:4f:4d
-      ip6: fe80::862b:2bff:fe70:4f4d
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:4f:4e
-      ip: 172.17.33.102
-  chassis:
-    serial: 8RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-20.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
index 0de86dfecf06dd421c0639d5dee210fac04a8ab6..b0cddfeeb5d5393b82f5e7a11a067f2dbcc784db 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-20:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 7RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:c3:d5
-      ip6: fe80::862b:2bff:fe70:c3d5
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.20
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:70:c3:d5
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:c3:d6
-      ip6: fe80::862b:2bff:fe70:c3d6
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:c3:d7
-      ip: 172.17.33.120
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 7RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-3.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
index 62c6de1621b6425efc3ec43beedae26abf33f59d..95c22cbea5ac7e08659ed4abec5c855426e2234a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-3:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 2RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:4e:1e
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.3
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:70:4e:1e
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:4e:1f
-      ip6: fe80::862b:2bff:fe70:c622
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:4e:20
-      ip: 172.17.33.103
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 2RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
index f156077a9b16f64ee03187e8019059e98e89612c..e31334b4d8c5c318edbd6d8ff007a31a946efc5b 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-4:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:48:31:43
-      ip6: fe80::862b:2bff:fe48:3143
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.4
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:48:31:43
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:48:31:44
-      ip6: fe80::862b:2bff:fe48:3144
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:48:31:45
-      ip: 172.17.33.104
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 3RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
index eb93e8b17772d162bf874f077b9ffd4a265d52bb..5a83f3f680d3b57063baa144e8d54f66f6093deb 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 6RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:70:cc:92
-      ip6: fe80::862b:2bff:fe70:cc92
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.5
-      driver: bnx2
-      mountable: true
+      mac: 84:2b:2b:70:cc:92
+      management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      rate: 1000000000
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:70:cc:93
-      ip6: fe80::862b:2bff:fe70:cc93
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:70:cc:94
-      ip: 172.17.33.105
-  chassis:
-    serial: 6RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
index 7de3a9a90168a719ccf34b464f887c0bcaabb60a..bd0de55a59658e4fda48a5d0eb119ed08a641f8c 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: FQM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:d5:9e
-      ip6: fe80::862b:2bff:fe72:d59e
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.6
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:d5:9e
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:d5:9f
-      ip6: fe80::862b:2bff:fe72:d59f
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:d5:a0
-      ip: 172.17.33.106
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: FQM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-7.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
index 14b26d6600cf2174c5c4a0712cadc00c5b53aa25..fc7045282ce0d65c33edc43726dedb6ab393cf1a 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-7:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 5RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:b3:44
-      ip6: fe80::862b:2bff:fe72:b344
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.7
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:b3:44
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:b3:45
-      ip6: fe80::862b:2bff:fe72:b345
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:b3:46
-      ip: 172.17.33.107
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  chassis:
-    serial: 5RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 292326211584
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    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/lille/clusters/chimint/nodes/chimint-8.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
index 749fac463f65f46d09134ee17cfbc73b269cf4c4..70c6a0332722b783677e167a923ee6d1e58aea97 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-8:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.5.3
     release_date: 10/22/2010
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC H700
-      device: sda
-      size: 292326211584
-      rev: 2.1
-      vendor: DELL
+    version: 1.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: CRM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:da:c3
-      ip6: fe80::862b:2bff:fe72:dac3
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.8
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:da:c3
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:da:c4
-      ip6: fe80::862b:2bff:fe72:dac4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:da:c5
-      ip: 172.17.33.108
-  chassis:
-    serial: CRM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H700
+      rev: 2.1
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
index bce7a913f93caa50316d8bd046e6d9a8afd7f32b..9ae57773f7390f40868f4d0f9e2d84fb582e6244 100644
--- a/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.yaml
@@ -1,65 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chimint-9:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 4RM1Z4J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 84:2b:2b:72:cb:e3
-      ip6: fe80::862b:2bff:fe70:c621
-      management: false
-      enabled: true
+      driver: bnx2
       interface: Ethernet
       ip: 172.16.33.9
-      driver: bnx2
-      mountable: true
-    eth1:
-      mounted: false
+      mac: 84:2b:2b:72:cb:e3
+      management: false
+      mounted: true
       rate: 1000000000
+    eth1:
+      driver: bnx2
+      interface: Ethernet
       mac: 84:2b:2b:72:cb:e4
-      ip6: fe80::862b:2bff:fe70:c622
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-    bmc:
-      mac: 84:2b:2b:72:cb:e5
-      ip: 172.17.33.109
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H700
       device: sda
-      size: 292326211584
+      model: PERC H700
       rev: 2.1
-      vendor: DELL
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 4RM1Z4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 292326211584
   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_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/lille/clusters/chirloute/chirloute_diff.yaml b/input/grid5000/sites/lille/clusters/chirloute/chirloute_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d000fe471e4ffa7a3544851c2f592423de7004aa
--- /dev/null
+++ b/input/grid5000/sites/lille/clusters/chirloute/chirloute_diff.yaml
@@ -0,0 +1,41 @@
+---
+nodes:
+
+  chirloute-[-]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: true
+        mountable: true
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 12582912
+      clock_speed: 2400000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
+      vendor: Intel
+      version: E5620
+    storage_devices:
+      sda:
+        vendor: SEAGATE
+
+  chirloute-6:
+    chassis:
+      serial: F385Z4J
+    network_adapters:
+      bmc:
+        ip: 172.17.35.106
+        mac: 00:26:6c:f9:17:22
+      eth0:
+        ip: 172.17.35.6
+      eth1:
+        ip6: fe80::226:6cff:fef9:1609
diff --git a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
index 33738c9484df24fcd1b7c322491cea0e80ef12a9..10944eed8f8c360052cd354dd65049f57a441aea 100644
--- a/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.yaml
@@ -1,65 +1,41 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 chirloute-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: 1.66
     release_date: 12/23/2011
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST3300657SS
-      device: sda
-      size: 300000000000
-      rev: ES64
-      vendor: SEAGATE
+    version: 1.66
+  chassis:
+    manufacturer: Dell
+    name: C6100
+    serial: F385Z4J
+  main_memory:
+    ram_size: 8383365120
   network_adapters:
     eth0:
-      mounted: false
-      rate: 1000000000
+      driver: igb
+      interface: Ethernet
       mac: 00:26:6c:f9:17:20
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.17.35.6
-    eth1:
-      mounted: true
+      mounted: false
       rate: 1000000000
-      mac: 00:26:6c:f9:17:21
-      ip6: fe80::226:6cff:fef9:1609
-      management: false
-      enabled: true
-      interface: Ethernet
+    eth1:
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.35.6
-    bmc:
-      mac: 00:26:6c:f9:17:22
-      ip: 172.17.35.106
+      mac: 00:26:6c:f9:17:21
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST3300657SS
+      rev: ES64
+      size: 300000000000
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: F385Z4J
-    manufacturer: Dell
-    name: C6100
-  main_memory:
-    ram_size: 8580497408
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2400000000
-    other_description: Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz
-    version: E5620
-    cache_l2: 262144
-    cache_l3: 12582912
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_diff.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f21295629b350c2c4a495c928d7d8bf45695af1e
--- /dev/null
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_diff.yaml
@@ -0,0 +1,313 @@
+---
+nodes:
+  granduc-[1-22]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: true
+        mountable: true
+      eth2:
+        enabled: true
+        mountable: true
+      eth3:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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:
+        vendor: SEAGATE
+
+  granduc-1:
+    chassis:
+      serial: 2QV963J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.1
+        mac: 00:1c:23:c8:69:c2
+      eth0:
+        ip6: fe80::219:b9ff:fef0:1c8
+      eth1:
+        ip: 172.16.178.1
+      eth2:
+        ip: 172.16.179.1
+        ip6: fe80::21b:21ff:fe34:e14b
+  granduc-10:
+    chassis:
+      serial: DELL
+    network_adapters:
+      bmc:
+        ip: 172.17.176.10
+        mac: 00:1c:23:d3:42:56
+      eth0:
+        ip6: fe80::222:19ff:fe6d:850a
+      eth1:
+        ip: 172.16.178.10
+      eth2:
+        ip: 172.16.179.10
+        ip6: fe80::21b:21ff:fe34:e13d
+  granduc-12:
+    chassis:
+      serial: 50W883J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.12
+        mac: 00:1c:23:d3:57:5f
+      eth0:
+        ip6: fe80::219:b9ff:fef2:e10
+      eth1:
+        ip: 172.16.178.12
+      eth2:
+        ip: 172.16.179.12
+        ip6: fe80::21b:21ff:fe34:e11c
+  granduc-13:
+    chassis:
+      serial: 40W883J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.13
+        mac: 00:1c:23:d3:57:75
+      eth0:
+        ip6: fe80::219:b9ff:fef2:e56
+      eth1:
+        ip: 172.16.178.13
+      eth2:
+        ip: 172.16.179.13
+        ip6: fe80::21b:21ff:fe3d:13af
+  granduc-14:
+    chassis:
+      serial: 10W883J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.14
+        mac: 00:1c:23:d3:57:3b
+      eth0:
+        ip6: fe80::219:b9ff:fef2:3bb
+      eth1:
+        ip: 172.16.178.14
+      eth2:
+        ip: 172.16.179.14
+        ip6: fe80::21b:21ff:fe3d:11f7
+  granduc-15:
+    chassis:
+      serial: 60W883J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.15
+        mac: 00:1c:23:d3:57:37
+      eth0:
+        ip6: fe80::219:b9ff:fef2:e2e
+      eth1:
+        ip: 172.16.178.15
+      eth2:
+        ip: 172.16.179.15
+        ip6: fe80::21b:21ff:fe34:e0f1
+      sda:
+        vendor: FUJITSU
+  granduc-16:
+    chassis:
+      serial: JZV883J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.16
+        mac: 00:1c:23:d3:57:67
+      eth0:
+        ip6: fe80::219:b9ff:fef2:f4b
+      eth1:
+        ip: 172.16.178.16
+      eth2:
+        ip: 172.16.179.16
+        ip6: fe80::21b:21ff:fe34:e11a
+  granduc-17:
+    chassis:
+      serial: 20W883J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.17
+        mac: 00:1c:23:d3:57:89
+      eth0:
+        ip6: fe80::219:b9ff:fede:b91c
+      eth1:
+        ip: 172.16.178.17
+      eth2:
+        ip: 172.16.179.17
+        ip6: fe80::21b:21ff:fe3c:8771
+  granduc-18:
+    chassis:
+      serial: GQ2593J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.18
+        mac: 00:1c:23:d6:c4:ea
+      eth0:
+        ip6: fe80::219:b9ff:fef3:bab0
+      eth1:
+        ip: 172.16.178.18
+      eth2:
+        ip: 172.16.179.18
+        ip6: fe80::21b:21ff:fe34:e107
+      sda:
+        vendor: FUJITSU
+  granduc-19:
+    chassis:
+      serial: 69N983J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.19
+        mac: 00:1c:23:d3:42:4e
+      eth0:
+        ip6: fe80::219:b9ff:fef2:edd
+      eth1:
+        ip: 172.16.178.19
+      eth2:
+        ip: 172.16.179.19
+        ip6: fe80::21b:21ff:fe3d:139b
+  granduc-2:
+    chassis:
+      serial: 1QV963J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.2
+        mac: 00:1c:23:c8:69:aa
+      eth0:
+        ip6: fe80::219:b9ff:fef0:1d7
+      eth1:
+        ip: 172.16.178.2
+      eth2:
+        ip: 172.16.179.2
+        ip6: fe80::21b:21ff:fe34:e135
+  granduc-20:
+    chassis:
+      serial: 39N983J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.20
+        mac: 00:1c:23:d3:42:6c
+      eth0:
+        ip6: fe80::219:b9ff:fef2:8ca
+      eth1:
+        ip: 172.16.178.20
+      eth2:
+        ip: 172.16.179.20
+        ip6: fe80::21b:21ff:fe3d:1327
+  granduc-21:
+    chassis:
+      serial: 1R2593J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.21
+        mac: 00:1c:23:d6:c3:0c
+      eth0:
+        ip6: fe80::219:b9ff:fef3:c27d
+      eth1:
+        ip: 172.16.178.21
+      eth2:
+        ip: 172.16.179.21
+        ip6: fe80::21b:21ff:fe3d:137d
+      sda:
+        vendor: FUJITSU
+  granduc-22:
+    chassis:
+      serial: HQ2593J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.22
+        mac: 00:1c:23:d6:c3:32
+      eth0:
+        ip6: fe80::219:b9ff:fef3:baa6
+      eth1:
+        ip: 172.16.178.22
+      eth2:
+        ip: 172.16.179.22
+        ip6: fe80::21b:21ff:fe34:e0e7
+      sda:
+        vendor: FUJITSU
+  granduc-4:
+    chassis:
+      serial: FQ2593J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.4
+        mac: 00:1c:23:d6:c3:06
+      eth0:
+        ip6: fe80::219:b9ff:fef2:ae6
+      eth1:
+        ip: 172.16.178.4
+      eth2:
+        ip: 172.16.179.4
+        ip6: fe80::21b:21ff:fe3d:12e9
+      sda:
+        vendor: FUJITSU
+  granduc-5:
+    chassis:
+      serial: 99N983J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.5
+        mac: 00:1c:23:d3:42:46
+      eth0:
+        ip6: fe80::219:b9ff:fef1:f809
+      eth1:
+        ip: 172.16.178.5
+      eth2:
+        ip: 172.16.179.5
+        ip6: fe80::21b:21ff:fe3d:12d1
+  granduc-6:
+    chassis:
+      serial: BQ2593J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.6
+        mac: 00:1c:23:d6:c3:08
+      eth0:
+        ip6: fe80::219:b9ff:fef2:c80
+      eth1:
+        ip: 172.16.178.6
+      eth2:
+        ip: 172.16.179.6
+        ip6: fe80::21b:21ff:fe3d:13ab
+      sda:
+        vendor: FUJITSU
+  granduc-7:
+    chassis:
+      serial: 49N983J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.7
+        mac: 00:1c:23:d3:42:2c
+      eth0:
+        ip6: fe80::219:b9ff:fef2:e6f
+      eth1:
+        ip: 172.16.178.7
+      eth2:
+        ip: 172.16.179.7
+        ip6: fe80::21b:21ff:fe34:e15f
+  granduc-8:
+    chassis:
+      serial: 59N983J
+    network_adapters:
+      bmc:
+        ip: 172.17.176.8
+        mac: 00:1c:23:d3:08:7a
+      eth0:
+        ip6: fe80::219:b9ff:feee:114a
+      eth1:
+        ip: 172.16.178.8
+      eth2:
+        ip: 172.16.179.8
+        ip6: fe80::21b:21ff:fe34:e18d
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
index 357bc032ca6159b4d9bd86fac8bc759078a68e18..b6d4b05382657696de344be3801fcb8627805fa7 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-1.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-1:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 2QV963J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f0:01:c8
-      ip6: fe80::219:b9ff:fef0:1c8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.1
+      mac: 00:19:b9:f0:01:c8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f0:01:ca
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.1
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:4b
-      ip6: fe80::21b:21ff:fe34:e14b
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.1
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:4a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.1
-      mac: 00:1c:23:c8:69:c2
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 2QV963J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
index 7f81fc34895cb8f5045b2977e64693c570ea50be..1cf38e2e7f4deaa82bc6b74dc9802af575c40793 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-10.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-10:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: DELL
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:22:19:6d:85:0a
-      ip6: fe80::222:19ff:fe6d:850a
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.10
+      mac: 00:22:19:6d:85:0a
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:22:19:6d:85:0c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.10
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:3d
-      ip6: fe80::21b:21ff:fe34:e13d
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.10
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:3c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.10
-      mac: 00:1c:23:d3:42:56
+      mounted: false
   storage_devices:
     sda:
-      model: ST9300603SS
       device: sda
-      size: 300000000000
+      model: ST9300603SS
       rev: FS64
-      vendor: SEAGATE
-  chassis:
-    serial: DELL
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 300000000000
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
index 7cf446af3564c2e14caa02462d64af5b50b14265..b5b1d80ff99a1de56219fdd1d5f9ac5d673621d4 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-12:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 50W883J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:10
-      ip6: fe80::219:b9ff:fef2:e10
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.12
+      mac: 00:19:b9:f2:0e:10
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0e:12
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.12
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:1c
-      ip6: fe80::21b:21ff:fe34:e11c
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.12
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:1d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.12
-      mac: 00:1c:23:d3:57:5f
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 50W883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
index b1d4340e2b4c1d3f5ce918b92aa634978f258c46..fed4145716c2c1a0baf605389fa180af8d4c7e4a 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-13.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-13:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 40W883J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:56
-      ip6: fe80::219:b9ff:fef2:e56
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.13
+      mac: 00:19:b9:f2:0e:56
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0e:58
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.13
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:af
-      ip6: fe80::21b:21ff:fe3d:13af
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.13
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:ae
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.13
-      mac: 00:1c:23:d3:57:75
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial: 40W883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
index 04a90020055dcadfd4603b19f67f51951b5d479f..c084044988ab23b1845ef83381e6af6cb2cc7854 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-14.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-14:
+  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: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 10W883J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:03:bb
-      ip6: fe80::219:b9ff:fef2:3bb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.14
+      mac: 00:19:b9:f2:03:bb
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:03:bd
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.14
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:11:f7
-      ip6: fe80::21b:21ff:fe3d:11f7
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.14
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:11:f6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.14
-      mac: 00:1c:23:d3:57:3b
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9146802SS
+      rev: S207
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 10W883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
index 33083b5e192a6d8ef16a7c7d0664ccddb3aca88a..d569f9412d7c3eac6f67149eff773c372b40459c 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-15:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: FUJITSU
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 60W883J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:2e
-      ip6: fe80::219:b9ff:fef2:e2e
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.15
+      mac: 00:19:b9:f2:0e:2e
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0e:30
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.15
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e0:f1
-      ip6: fe80::21b:21ff:fe34:e0f1
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.15
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e0:f0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.15
-      mac: 00:1c:23:d3:57:37
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9146802SS
+      rev: S207
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 60W883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
index 445afbdb84b802010966acaba48c63e9583dcd94..d5939cbe6c1f91a8812e77cc2338c6f11a0a885a 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-16:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: JZV883J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0f:4b
-      ip6: fe80::219:b9ff:fef2:f4b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.16
+      mac: 00:19:b9:f2:0f:4b
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0f:4d
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.16
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:1a
-      ip6: fe80::21b:21ff:fe34:e11a
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.16
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:1b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.16
-      mac: 00:1c:23:d3:57:67
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial: JZV883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
index 31b7ec69d213eb87893a2490191c06820c550aca..263b6d5447670a4a90e9a306e9b9a318bc8677d5 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-17.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-17:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:de:b9:1c
-      ip6: fe80::219:b9ff:fede:b91c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.17
+      mac: 00:19:b9:de:b9:1c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:de:b9:1e
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.17
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3c:87:71
-      ip6: fe80::21b:21ff:fe3c:8771
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.17
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3c:87:70
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.17
-      mac: 00:1c:23:d3:57:89
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial: 20W883J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
index 8e41dc6c117f6ceeb27effe86b9640c0c5392bba..eaf5b519baaab9fd291159bea3cdd49f3e5613f1 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-18:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: GQ2593J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f3:ba:b0
-      ip6: fe80::219:b9ff:fef3:bab0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.18
+      mac: 00:19:b9:f3:ba:b0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f3:ba:b2
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.18
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:07
-      ip6: fe80::21b:21ff:fe34:e107
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.18
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:06
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.18
-      mac: 00:1c:23:d6:c4:ea
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: MBB2147RC
       device: sda
-      size: 146815733760
+      model: MBB2147RC
       rev: D406
-      vendor: FUJITSU
-  chassis:
-    serial: GQ2593J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
index e2fce6c5feabfaeb3242f2978f412f3ca64d4c30..76949d8955d3b4732917b1c52fec1b6bfafcff62 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-19.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-19:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST9146802SS
-      device: sda
-      size: 146815733760
-      rev: S207
-      vendor: SEAGATE
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 69N983J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:dd
-      ip6: fe80::219:b9ff:fef2:edd
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.19
+      mac: 00:19:b9:f2:0e:dd
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0e:df
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.19
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:9b
-      ip6: fe80::21b:21ff:fe3d:139b
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.19
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:9a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.19
-      mac: 00:1c:23:d3:42:4e
-  chassis:
-    serial: 69N983J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9146802SS
+      rev: S207
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
index cf38bc82fe6da7a3a39e11a5cf5f0b92be27cdd0..e033ba1f6a735c2a4c0b2e828875f7e47c9193ab 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-2:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 1QV963J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f0:01:d7
-      ip6: fe80::219:b9ff:fef0:1d7
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.2
+      mac: 00:19:b9:f0:01:d7
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f0:01:d9
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.2
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:35
-      ip6: fe80::21b:21ff:fe34:e135
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.2
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:34
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.2
-      mac: 00:1c:23:c8:69:aa
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 1QV963J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  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/luxembourg/clusters/granduc/nodes/granduc-20.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
index e0937b0f126f3851e610dc0b101844163404ac30..3c74c943aeca34f7cc0f4705ee53043292914eaa 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-20:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 39N983J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:08:ca
-      ip6: fe80::219:b9ff:fef2:8ca
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.20
+      mac: 00:19:b9:f2:08:ca
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:08:cc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.20
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:27
-      ip6: fe80::21b:21ff:fe3d:1327
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.20
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:26
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.20
-      mac: 00:1c:23:d3:42:6c
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  chassis:
-    serial: 39N983J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 146815733760
   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/luxembourg/clusters/granduc/nodes/granduc-21.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
index 65215a77271f484a8dcf3cad42872486edc09a94..4c697b45eee181d842f581dc87c5e420a5a4153f 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-21:
+  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: MBD2147RC
-      device: sda
-      size: 146815733760
-      rev: D80A
-      vendor: FUJITSU
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 1R2593J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f3:c2:7d
-      ip6: fe80::219:b9ff:fef3:c27d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.21
+      mac: 00:19:b9:f3:c2:7d
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f3:c2:7f
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.21
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:7d
-      ip6: fe80::21b:21ff:fe3d:137d
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.21
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:7c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.21
-      mac: 00:1c:23:d6:c3:0c
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: MBD2147RC
+      rev: D80A
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 1R2593J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  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/luxembourg/clusters/granduc/nodes/granduc-22.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
index fd2184b10d7b7baaa547989da74d5cb9ed6b9268..94a4dca323b90305d6ec9cd89501a11dcdaa9d39 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-22.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-22:
+  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
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: HQ2593J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f3:ba:a6
-      ip6: fe80::219:b9ff:fef3:baa6
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.22
+      mac: 00:19:b9:f3:ba:a6
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f3:ba:a8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.22
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e0:e7
-      ip6: fe80::21b:21ff:fe34:e0e7
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.22
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e0:e6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.22
-      mac: 00:1c:23:d6:c3:32
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: MBB2147RC
+      rev: D406
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: HQ2593J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  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/luxembourg/clusters/granduc/nodes/granduc-4.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
index f8d4b8c5e5ce9b2b7fc1c530fec7fbe1edac4f47..f8bd779802b311ef998d4b5f457c6f398dc49f39 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-4:
+  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
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: FQ2593J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0a:e6
-      ip6: fe80::219:b9ff:fef2:ae6
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.4
+      mac: 00:19:b9:f2:0a:e6
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0a:e8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.4
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:12:e9
-      ip6: fe80::21b:21ff:fe3d:12e9
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.4
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:12:e8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.4
-      mac: 00:1c:23:d6:c3:06
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: MBB2147RC
+      rev: D406
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: FQ2593J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
index 06c031015a522c819af7925b548ba32c63c5501f..81a962e10e4e051b3caa4f74b1c795749e15656e 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-5.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-5:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 99N983J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f1:f8:09
-      ip6: fe80::219:b9ff:fef1:f809
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.5
+      mac: 00:19:b9:f1:f8:09
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f1:f8:0b
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.5
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:12:d1
-      ip6: fe80::21b:21ff:fe3d:12d1
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.5
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:12:d0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.5
-      mac: 00:1c:23:d3:42:46
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 99N983J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  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/luxembourg/clusters/granduc/nodes/granduc-6.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
index 86fdf2bed5226d1ee251d9f679cb42efc459cfa0..67fecfe4c9b4af868424b6ac1626ef53d594477b 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-6:
+  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
-      device: sda
-      size: 146815733760
-      rev: D406
-      vendor: FUJITSU
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.7
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: BQ2593J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0c:80
-      ip6: fe80::219:b9ff:fef2:c80
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.6
+      mac: 00:19:b9:f2:0c:80
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0c:82
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.6
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:ab
-      ip6: fe80::21b:21ff:fe3d:13ab
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.6
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:3d:13:aa
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.6
-      mac: 00:1c:23:d6:c3:08
-  chassis:
-    serial: BQ2593J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: MBB2147RC
+      rev: D406
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
index 188d99ba19f583ee1fa03c85b2c81287b8c8f388..3fa6f133e541418ad036a1a0be89262d2d0aebf9 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-7.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-7:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 49N983J
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:f2:0e:6f
-      ip6: fe80::219:b9ff:fef2:e6f
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.7
+      mac: 00:19:b9:f2:0e:6f
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:f2:0e:71
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.7
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:5f
-      ip6: fe80::21b:21ff:fe34:e15f
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.7
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:5e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.7
-      mac: 00:1c:23:d3:42:2c
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S207
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 49N983J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 17179869184
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
index 5ea871f6b957b8918250f0456127902a87ab514d..090e744af2331cf85760e0cd3e406cab74501afb 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-8.yaml
@@ -1,83 +1,53 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 granduc-8:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge 1950
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:19:b9:ee:11:4a
-      ip6: fe80::219:b9ff:feee:114a
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.176.8
+      mac: 00:19:b9:ee:11:4a
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:19:b9:ee:11:4c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: bnx2
-      mountable: true
-      ip: 172.16.178.8
-    eth2:
       mounted: false
-      rate: 10000000000
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:8d
-      ip6: fe80::21b:21ff:fe34:e18d
       management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.179.8
-      driver: ixgbe
-      mountable: true
-    eth3:
       mounted: false
+      rate: 10000000000
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:1b:21:34:e1:8c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    bmc:
-      ip: 172.17.176.8
-      mac: 00:1c:23:d3:08:7a
+      mounted: false
   storage_devices:
     sda:
-      model: ST9146802SS
       device: sda
-      size: 146815733760
+      model: ST9146802SS
       rev: S229
-      vendor: SEAGATE
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 146815733760
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 59N983J
-    manufacturer: Dell Inc.
-    name: PowerEdge 1950
-  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/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
index c4ec3dd7122e02596e1dbc9925716898c825adc2..b0a1eaf9a04942df72145e0d2f35950dfc72dd88 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-1:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
+    release_date: 07/02/2014
     vendor: Dell Inc.
     version: 2.4
-    release_date: 07/02/2014
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 1NVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.1
-      driver: bnx2x
       mac: 90:b1:1c:ac:d2:c1
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d2:c4
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.1
-      mac: 90:b1:1c:ac:d2:c0
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  main_memory:
-    ram_size: 34359738368
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 250059350016
-      vendor: SEAGATE
       model: ST9250610NS
       rev: AA08
+      size: 250059350016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
index a4e91d36cfc96f4fe17fb29bdb2298b987d98744..0d8fe2e25021f9f88502e3bc2a65f9a928c077b8 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-10:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 12
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  main_memory:
-    ram_size: 34359738368
   bios:
+    release_date: 07/02/2014
     vendor: Dell Inc.
     version: 2.4
-    release_date: 07/02/2014
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: BMVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.10
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:36
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:39
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.10
-      mac: 90:b1:1c:ac:d3:35
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
index d7878660ec057f245746dd61df8e4dd2d28b1b7e..f8b188f5c6a82a30c5da578779bae88157b2b675 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-11:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 12
-    platform_type: x86_64
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: CMVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.11
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:43
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:46
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.10
-      mac: 90:b1:1c:ac:d3:42
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
index 3165c21de95b10259dc30a536c8e920e831321bc..9725b69b12eb6d4c447b48428c8d8b74a88c1a42 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-12.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-12:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: DMVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.12
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:50
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:53
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.12
-      mac: 90:b1:1c:ac:d3:4f
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
+      mounted: false
   storage_devices:
     sda:
-      vendor: SEAGATE
+      device: sda
       model: ST9250610NS
       rev: AA08
-      device: sda
       size: 250059350016
-  main_memory:
-    ram_size: 34359738368
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
index 64a6fa613ff33aa0560e1b2de0c4f7b1c508a41a..ab34e9b3660be8278872b705d3bf72349c7cc4d9 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-13:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 12
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: FMVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.13
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:5d
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:60
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.13
-      mac: 90:b1:1c:ac:d3:5c
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
   storage_devices:
     sda:
-      vendor: SEAGATE
+      device: sda
       model: ST9250610NS
       rev: AA08
-      device: sda
       size: 250059350016
-  main_memory:
-    ram_size: 34359738368
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
index 6d7bac6a2c9ae9f545036d0bfe6cfa8553b0a9f2..f9c706b1bc868faec2b1b6b46572048de8060bb7 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-14:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: GMVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.14
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:6a
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:6d
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.14
-      mac: 90:b1:1c:ac:d3:69
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
index f37a64d55778cc80418dd2d574847bbbc0ecd75e..8e2cb0ed7e05e7b68ee3efdbf132ec586ca7a09d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-15:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
+    release_date: 07/02/2014
     vendor: Dell Inc.
     version: 2.4
-    release_date: 07/02/2014
-  supported_job_types:
-    virtual: ivt
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: HMVTG5J
   main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.15
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:77
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:7a
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.15
-      mac: 90:b1:1c:ac:d3:76
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
index a9459ac2957b4a96bab681aa471f2be01b401090..bd6cf82161b6ab561e7087dc1fdeee93a9fc59a6 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-16:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 12
-    platform_type: x86_64
   bios:
+    release_date: 07/02/2014
     vendor: Dell Inc.
     version: 2.4
-    release_date: 07/02/2014
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: JMVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.16
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:84
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:87
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.16
-      mac: 90:b1:1c:ac:d3:83
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
index 3c9519f9bafd0045dc3747120926bd4e823ceacc..16073f5c44eb0345003d1a2664a517d2eb2b891d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-2:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 2MVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.2
-      driver: bnx2x
       mac: 90:b1:1c:ac:d2:ce
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d2:d1
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.2
-      mac: 90:b1:1c:ac:d2:cd
+      mounted: false
   storage_devices:
     sda:
-      vendor: SEAGATE
+      device: sda
       model: ST9250610NS
       rev: AA08
-      device: sda
       size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
   supported_job_types:
     virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
-  main_memory:
-    ram_size: 34359738368
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
index b619037676ff2be7612d91d66b62d19c3806b1ab..da94af56f9fb1a79187dd0f137681ea701c996b7 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-3:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  supported_job_types:
-    virtual: ivt
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 12
-    platform_type: x86_64
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 3MVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.3
-      driver: bnx2x
       mac: 90:b1:1c:ac:d2:db
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d2:de
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.3
-      mac: 90:b1:1c:ac:d2:da
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
-  main_memory:
-    ram_size: 34359738368
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
index eb0982d602d60e6bebd78c67f6a5f7d2b0c7d943..243fc7ef5526c87d5823b48fd13840b885ca0cbd 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-4:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 12
-    platform_type: x86_64
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 4MVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.4
-      driver: bnx2x
       mac: 90:b1:1c:ac:d2:e8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d2:eb
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.3
-      mac: 90:b1:1c:ac:d2:e7
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
index b72c0566fb1e65ae594411d2d05311173d85aea2..e28a718e7eeb5e0a79a785a29ac679b4d826085e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-5:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 5MVTG5J
   main_memory:
-    ram_size: 34359738368
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.5
-      driver: bnx2x
       mac: 90:b1:1c:ac:d2:f5
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d2:f8
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.5
-      mac: 90:b1:1c:ac:d2:f4
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
+      mounted: false
   storage_devices:
     sda:
-      vendor: SEAGATE
+      device: sda
       model: ST9250610NS
       rev: AA08
-      device: sda
       size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
index 4bc630981625744b75365c385bea8173efe32c0d..3ead91dcf19148dc2decb4b42c1c7dd95592b3fc 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-6:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 6MVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.6
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:02
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:05
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.6
-      mac: 90:b1:1c:ac:d3:01
+      mounted: false
   storage_devices:
     sda:
-      vendor: SEAGATE
+      device: sda
       model: ST9250610NS
       rev: AA08
-      device: sda
       size: 250059350016
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 34359738368
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
index b72f8514508c02748ae8881a6479293c4aaf8402..c0beb97a649f8f6aa315ababfe6ddd85950ff50d 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-7:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  supported_job_types:
-    virtual: ivt
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 07/02/2014
+    vendor: Dell Inc.
+    version: 2.4
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 7MVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.7
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:0f
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:12
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.7
-      mac: 90:b1:1c:ac:d3:0e
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.4
-    release_date: 07/02/2014
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+      mounted: false
   storage_devices:
     sda:
-      vendor: SEAGATE
+      device: sda
       model: ST9250610NS
       rev: AA08
-      device: sda
       size: 250059350016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
index 4450e99a114ffdf871ece2254c0396658cf3442a..b029f9a0a6c1f34f17bfcd5ccdd83b0e04eca032 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -1,58 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 petitprince-9:
-  operating_system:
-    kernel: 3.2.0-4-amd64
-    name: debian
-    version: 7.1
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 34359738368
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
+    release_date: 07/02/2014
     vendor: Dell Inc.
     version: 2.4
-    release_date: 07/02/2014
-  storage_devices:
-    sda:
-      vendor: SEAGATE
-      model: ST9250610NS
-      rev: AA08
-      device: sda
-      size: 250059350016
-  processor:
-    clock_speed: 2000000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630L
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge M620
+    serial: 9MVTG5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.177.9
-      driver: bnx2x
       mac: 90:b1:1c:ac:d3:29
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 90:b1:1c:ac:d3:2c
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    bmc:
-      ip: 172.17.177.9
-      mac: 90:b1:1c:ac:d3:28
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST9250610NS
+      rev: AA08
+      size: 250059350016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_diff.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ae334e8d9980f58d13ae357ea045ceab864f8d6b
--- /dev/null
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_diff.yaml
@@ -0,0 +1,104 @@
+---
+nodes:
+  petitprince-[-]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 3.2.0-4-amd64
+      name: debian
+      version: 7.1
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 15728640
+      clock_speed: 2000000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2630L 0 @ 2.00GHz
+      vendor: Intel
+      version: E5-2630L
+    storage_devices:
+      sda:
+        vendor: SEAGATE
+
+  petitprince-1:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.1
+        mac: 90:b1:1c:ac:d2:c0
+  petitprince-10:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.10
+        mac: 90:b1:1c:ac:d3:35
+  petitprince-11:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.10
+        mac: 90:b1:1c:ac:d3:42
+  petitprince-12:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.12
+        mac: 90:b1:1c:ac:d3:4f
+  petitprince-13:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.13
+        mac: 90:b1:1c:ac:d3:5c
+  petitprince-14:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.14
+        mac: 90:b1:1c:ac:d3:69
+  petitprince-15:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.15
+        mac: 90:b1:1c:ac:d3:76
+  petitprince-16:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.16
+        mac: 90:b1:1c:ac:d3:83
+  petitprince-2:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.2
+        mac: 90:b1:1c:ac:d2:cd
+  petitprince-3:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.3
+        mac: 90:b1:1c:ac:d2:da
+  petitprince-4:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.3
+        mac: 90:b1:1c:ac:d2:e7
+  petitprince-5:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.5
+        mac: 90:b1:1c:ac:d2:f4
+  petitprince-6:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.6
+        mac: 90:b1:1c:ac:d3:01
+  petitprince-7:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.7
+        mac: 90:b1:1c:ac:d3:0e
+  petitprince-9:
+    network_adapters:
+      bmc:
+        ip: 172.17.177.9
+        mac: 90:b1:1c:ac:d3:28
diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule_diff.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9d5136426109243362df7c0a06f4b2d188970462
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/hercule/hercule_diff.yaml
@@ -0,0 +1,72 @@
+---
+nodes:
+  hercule-[-]:
+    network_adapters:
+      eth0:
+        enabled: false
+        mountable: false
+      eth1:
+        enabled: true
+        mountable: true
+      eth2:
+        enabled: true
+        mountable: true
+      eth3:
+        enabled: true
+        mountable: true
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 15728640
+      clock_speed: 2000000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
+      vendor: Intel
+      version: E5-2620
+
+  hercule-1:
+    chassis:
+      serial: JQ3HD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.51.1
+        mac: 84:8f:69:fd:4d:38
+      eth1:
+        ip6: fe80::28c:faff:fe0b:b9c3
+        switch_port: TenGigabitEthernet 0/24
+  hercule-2:
+    chassis:
+      serial: HQ3HD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.51.2
+        mac: 84:8f:69:fd:4f:3f
+      eth1:
+        ip6: fe80::28c:faff:fe0b:b4bd
+        switch_port: TenGigabitEthernet 0/25
+  hercule-3:
+    chassis:
+      serial: FQ3HD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.51.3
+        mac: 84:8f:69:fd:4c:21
+      eth1:
+        ip6: fe80::28c:faff:fe0b:e179
+        switch_port: TenGigabitEthernet 0/26
+  hercule-4:
+    chassis:
+      serial: GQ3HD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.51.4
+        mac: 84:8f:69:fd:4a:53
+      eth1:
+        ip6: fe80::28c:faff:fe0b:d853
+        switch_port: TenGigabitEthernet 0/27
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
index 8ec98b90143fa52a1258fd13f6e48f4799aeadb0..13bcd797d7cb061ffd73943e720f99e89e4f6e23 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -1,89 +1,62 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 hercule-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.0.21
     release_date: 04/26/2012
     vendor: Dell Inc.
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: JQ3HD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:8c:fa:0b:b9:c2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/24
-      rate: 10000000000
-      mac: 00:8c:fa:0b:b9:c3
-      ip6: fe80::28c:faff:fe0b:b9c3
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.51.1
+      mac: 00:8c:fa:0b:b9:c3
+      management: false
+      mounted: true
+      rate: 10000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4d:36
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4d:37
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4d:38
-      ip: 172.17.51.1
+      mounted: false
   storage_devices:
     sda:
-      model: WDC WD2003FYYS-1
       device: sda
-      size: 2000398934016
+      model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
     sdb:
-      model: WDC WD2003FYYS-1
       device: sdb
-      size: 2000398934016
+      model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
     sdc:
-      model: WDC WD2003FYYS-1
       device: sdc
-      size: 2000398934016
+      model: WDC WD2003FYYS-1
       rev: 1.0
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: JQ3HD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
index 297c697f9b6008af7c6b6feb2c7faf6266330c12..5dfb691e0d5e0dc0a310ce26810567a93b0f2359 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -1,89 +1,62 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 hercule-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.0.21
     release_date: 04/26/2012
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: HQ3HD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:8c:fa:0b:b4:bc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/25
-      rate: 10000000000
-      mac: 00:8c:fa:0b:b4:bd
-      ip6: fe80::28c:faff:fe0b:b4bd
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.51.2
+      mac: 00:8c:fa:0b:b4:bd
+      management: false
+      mounted: true
+      rate: 10000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4f:3d
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4f:3e
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4f:3f
-      ip: 172.17.51.2
+      mounted: false
   storage_devices:
     sda:
-      model: WDC WD2003FYYS-1
       device: sda
-      size: 2000398934016
+      model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
     sdb:
-      model: WDC WD2003FYYS-1
       device: sdb
-      size: 2000398934016
+      model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
     sdc:
-      model: WDC WD2003FYYS-1
       device: sdc
-      size: 2000398934016
+      model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: HQ3HD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
index e2bc67cebca7026322d833f9b0b0d7b2608e476b..e67dff7cfd2b60857d6759bf6ab05c702e822949 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -1,89 +1,62 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 hercule-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.0.21
     release_date: 04/26/2012
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: WDC WD2003FYYS-1
-      device: sda
-      size: 2000398934016
-      rev: 1.0
-    sdb:
-      model: WDC WD2003FYYS-1
-      device: sdb
-      size: 2000398934016
-      rev: 1.0
-    sdc:
-      model: WDC WD2003FYYS-1
-      device: sdc
-      size: 2000398934016
-      rev: 1.0
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: FQ3HD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:8c:fa:0b:e1:78
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/26
-      rate: 10000000000
-      mac: 00:8c:fa:0b:e1:79
-      ip6: fe80::28c:faff:fe0b:e179
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.51.3
+      mac: 00:8c:fa:0b:e1:79
+      management: false
+      mounted: true
+      rate: 10000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4c:1f
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4c:20
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4c:21
-      ip: 172.17.51.3
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: FQ3HD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+    sdb:
+      device: sdb
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+    sdc:
+      device: sdc
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    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/lyon/clusters/hercule/nodes/hercule-4.yaml b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
index 40a2f9c505fbaef55ec3d3f6913af7f897d74ea6..934a60c8a59d466233954cd9040edee8f8d88c04 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -1,89 +1,62 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 hercule-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.0.21
     release_date: 04/26/2012
     vendor: Dell Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: WDC WD2003FYYS-1
-      device: sda
-      size: 2000398934016
-      rev: 1.0
-    sdb:
-      model: WDC WD2003FYYS-1
-      device: sdb
-      size: 2000398934016
-      rev: 1.0
-    sdc:
-      model: WDC WD2003FYYS-1
-      device: sdc
-      size: 2000398934016
-      rev: 1.0
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: GQ3HD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: 00:8c:fa:0b:d8:52
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/27
-      rate: 10000000000
-      mac: 00:8c:fa:0b:d8:53
-      ip6: fe80::28c:faff:fe0b:d853
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.51.4
+      mac: 00:8c:fa:0b:d8:53
+      management: false
+      mounted: true
+      rate: 10000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4a:51
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4a:52
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-    bmc:
-      mac: 84:8f:69:fd:4a:53
-      ip: 172.17.51.4
-  chassis:
-    serial: GQ3HD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+    sdb:
+      device: sdb
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+    sdc:
+      device: sdc
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 34359738368
-  processor:
-    model: Intel Xeon
-    cache_l1d: 32768
-    clock_speed: 2000000000
-    other_description: Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz
-    version: E5-2620
-    cache_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
index f555be8d9839b517c603716014d54a4aa830239b..cdf03512d0b111d4c06fddb57eeac4239504c36d 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 orion-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
+    version: 1.2
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: B3MJD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/18
-      rate: 10000000000
-      mac: a0:36:9f:08:fa:54
-      ip6: fe80::a236:9fff:fe08:fa54
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.50.1
+      mac: a0:36:9f:08:fa:54
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:fa:56
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:9c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:9d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:9e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:9f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f3:bf:9e
-      ip: 172.17.50.1
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
-  chassis:
-    serial: B3MJD5J
-    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/lyon/clusters/orion/nodes/orion-2.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
index ee71bfb629a22620d7c08ae9d1db12ce08f0c143..b649dbf4d373dd3f92b919cfdc63fcb05f379170 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 orion-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
+    version: 1.2
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: 93MJD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/19
-      rate: 10000000000
-      mac: a0:36:9f:08:f6:b8
-      ip6: fe80::a236:9fff:fe08:f6b8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.50.2
+      mac: a0:36:9f:08:f6:b8
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:f6:ba
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:58
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:59
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:5a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:5b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:28
-      ip: 172.17.50.2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 93MJD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
-  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/lyon/clusters/orion/nodes/orion-3.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
index 299335663281c7938ff2b8b2dd5cc7c0650289b2..4d44a87284b45f6c7acd725982e0962b5aabe247 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 orion-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.2
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: C3MJD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/20
-      rate: 10000000000
-      mac: a0:36:9f:08:fa:44
-      ip6: fe80::a236:9fff:fe08:fa44
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.50.3
+      mac: a0:36:9f:08:fa:44
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:fa:46
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:2c:3c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:2c:3d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:2c:3e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:2c:3f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:24
-      ip: 172.17.50.3
-  chassis:
-    serial: C3MJD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H710
+      rev: 3.13
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
index 39119fc7beadd53baf64cd9457f712fef82e721a..628dde8430d4e29aa6a4e7ccec78bbb43dc3d9d1 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 orion-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 1.2.6
     release_date: 05/10/2012
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
+    version: 1.2
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: 83MJD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/21
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:c0
-      ip6: fe80::a236:9fff:fe08:f8c0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.50.4
+      mac: a0:36:9f:08:f8:c0
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:f8:c2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:5c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:5d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:5e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:25:5f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f5:ea:e2
-      ip: 172.17.50.4
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H710
+      rev: 3.13
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 83MJD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
-  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_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_diff.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..eb9fbe1300d769e333a9298a0f7e6159ea89188b
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_diff.yaml
@@ -0,0 +1,78 @@
+---
+nodes:
+  orion-[1-4]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        mountable: false
+      eth3:
+        enabled: false
+        mountable: false
+      eth4:
+        enabled: false
+        mountable: false
+      eth5:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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
+
+  orion-1:
+    chassis:
+      serial: B3MJD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.50.1
+        mac: d4:be:d9:f3:bf:9e
+      eth0:
+        ip6: fe80::a236:9fff:fe08:fa54
+        switch_port: TenGigabitEthernet 0/18
+  orion-2:
+    chassis:
+      serial: 93MJD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.50.2
+        mac: d4:be:d9:f9:a3:28
+      eth0:
+        ip6: fe80::a236:9fff:fe08:f6b8
+        switch_port: TenGigabitEthernet 0/19
+  orion-3:
+    chassis:
+      serial: C3MJD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.50.3
+        mac: d4:be:d9:f9:a3:24
+      eth0:
+        ip6: fe80::a236:9fff:fe08:fa44
+        switch_port: TenGigabitEthernet 0/20
+  orion-4:
+    chassis:
+      serial: 83MJD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.50.4
+        mac: d4:be:d9:f5:ea:e2
+      eth0:
+        ip6: fe80::a236:9fff:fe08:f8c0
+        switch_port: TenGigabitEthernet 0/21
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
index dc66a75ddd9411a8986debb6baeb466b7ba6d5bd..3667ce6c90991babf10a6878c006b31ce361e55a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-1.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-1:
+  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: XG052536201
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:9e:13
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.101
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:1"
-      rate: 1000000000
-      mac: 00:09:3d:12:9e:14
-      ip6: fe80::209:3dff:fe12:9e14
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.1
-    bmc:
-      mac: 00:09:3d:12:9e:15
-      ip: 172.17.49.1
+      mac: 00:09:3d:12:9e:14
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052536201
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-11.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
index 709921612079002a56c6edf045ce056c3f5615ce..076413ffedd4964a94c16f39cf7fabb9ec997e18 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-11:
+  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: XG052536163
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:9e:06
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.111
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:11"
-      rate: 1000000000
-      mac: 00:09:3d:12:9e:07
-      ip6: fe80::209:3dff:fe12:9e07
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.11
-    bmc:
-      mac: 00:09:3d:12:9e:0f
-      ip: 172.17.49.11
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:9e:07
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373307LC
       device: sda
+      model: ST373307LC
+      rev: 8.0
       size: 73407868928
-      rev: 8
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052536163
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-12.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
index 9fcb0a817c6edecda6fd0c7f95d2dbc4cfa08a49..2dbee504db87af6cb6fa4f608f8841cc43d97909 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-12:
+  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: XG052423635
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3c:2b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.112
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:12"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:2c
-      ip6: fe80::209:3dff:fe12:3c2c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.12
-    bmc:
-      mac: 00:09:3d:12:3c:2d
-      ip: 172.17.49.12
+      mac: 00:09:3d:12:3c:2c
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373307LC
       device: sda
+      model: ST373307LC
+      rev: 8.0
       size: 73407868928
-      rev: 8
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052423635
-    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-13.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
index 17b37c59612befbea68f052f6e1b03ff20082ef1..8b8588051cf6f32b1822cfcdb2d4c7da2859c319 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-13:
+  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: XG052428994
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:91:60
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.113
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:13"
-      rate: 1000000000
-      mac: 00:09:3d:12:91:61
-      ip6: fe80::209:3dff:fe12:9161
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.13
-    bmc:
-      mac: 00:09:3d:12:91:62
-      ip: 172.17.49.13
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:91:61
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052428994
-    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-14.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
index 5c538bf2ff8f9a5d6b3930874bc04319fc243f29..bc0e0c88f83b00e2320ba95e6e3c2735eb830b81 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-14:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052080114
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7a:bc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.114
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:14"
-      rate: 1000000000
-      mac: 00:09:3d:12:7a:bd
-      ip6: fe80::209:3dff:fe12:7abd
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.14
-    bmc:
-      mac: 00:09:3d:12:7a:be
-      ip: 172.17.49.14
+      mac: 00:09:3d:12:7a:bd
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052080114
-    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-15.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
index 90a1a22f1e1ae5b4ecafd78cd85818eaf4b9893b..e3417fb586aee149a76abd885b3394b7dfb638ac 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-15:
+  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: XG052422326
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:28:70
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.115
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:15"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:71
-      ip6: fe80::209:3dff:fe12:2871
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.15
-    bmc:
-      mac: 00:09:3d:12:28:72
-      ip: 172.17.49.15
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:28:71
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052422326
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-16.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
index 30b6036150435ecdad8d4178b81ca6b912d6e7a7..f5476c5ab679728ee111095ece51c4ce20dd8345 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-16:
+  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: XG052429007
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7d:06
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.116
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:16"
-      rate: 1000000000
-      mac: 00:09:3d:12:7d:07
-      ip6: fe80::209:3dff:fe12:7d07
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.16
-    bmc:
-      mac: 00:09:3d:12:7d:08
-      ip: 172.17.49.16
+      mac: 00:09:3d:12:7d:07
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052429007
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
   supported_job_types:
     virtual: false
-  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-17.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
index 9099bd374ee1b7464790c4587e740b3154e2ea8d..d0ec5668bedc373a6289e091fc51c79208e30338 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-17:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052081146
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:e7:62
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.117
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:17"
-      rate: 1000000000
-      mac: 00:09:3d:11:e7:63
-      ip6: fe80::209:3dff:fe11:e763
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.17
-    bmc:
-      mac: 00:09:3d:11:e7:64
-      ip: 172.17.49.17
+      mac: 00:09:3d:11:e7:63
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052081146
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-18.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
index c43afdf27fb7918bcc4586a66a0dfe8180719c33..091a6c7817d703c7198dde6b1684763c8375c1dd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-18:
+  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: XG052429080
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7e:f1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.118
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:18"
-      rate: 1000000000
-      mac: 00:09:3d:12:7e:f2
-      ip6: fe80::209:3dff:fe12:7ef2
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.18
-    bmc:
-      mac: 00:09:3d:12:7e:f3
-      ip: 172.17.49.18
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:7e:f2
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052429080
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-19.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
index 6256ea4ccf8e4f6187a6f2ab55bde8ee37aa4528..e00c45c79bd18228d0091e2ee144692746b93b96 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-19.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-19:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052428991
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:90:56
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.119
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:19"
-      rate: 1000000000
-      mac: 00:09:3d:12:90:57
-      ip6: fe80::209:3dff:fe12:9057
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.19
-    bmc:
-      mac: 00:09:3d:12:90:58
-      ip: 172.17.49.19
-  chassis:
-    serial: XG052428991
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:90:57
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  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-2.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
index 160a353d0cdf1d24e7fcf341ebc6ffb044cd3361..e811bcf3313d6397d84095b59482c00f5f0359b5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-2:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052310079
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:65:7c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.102
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:2"
-      rate: 1000000000
-      mac: 00:09:3d:12:65:7d
-      ip6: fe80::209:3dff:fe12:657d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.2
-    bmc:
-      mac: 00:09:3d:12:65:7e
-      ip: 172.17.49.2
-  chassis:
-    serial: XG052310079
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:65:7d
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      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-20.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
index 3c2dd617c556a39bdc1728abe2f9e57618456373..485009a05c4a31a84cd41ddda1d571d9f18803ed 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-20:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052428987
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:90:83
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.120
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:20"
-      rate: 1000000000
-      mac: 00:09:3d:12:90:84
-      ip6: fe80::209:3dff:fe12:9084
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.20
-    bmc:
-      mac: 00:09:3d:12:90:85
-      ip: 172.17.49.20
-  chassis:
-    serial: XG052428987
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:90:84
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      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-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
index 737db6888f40397a406bb8e09ba38cf99c141367..9def79c03d99dc063011fdc3dee096b9ab56763c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -1,69 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-22:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 2
   bios:
-    version: V1.32.7.2
     release_date: 03/02/2005
     vendor: Phoenix Technologies Ltd.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
+    version: V1.32.7.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052429001
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:90:9e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.122
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:22"
-      rate: 1000000000
-      mac: 00:09:3d:12:90:9f
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.22
-    bmc:
-      mac: 00:09:3d:12:90:a0
-      ip: 172.17.49.22
+      mac: 00:09:3d:12:90:9f
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052429001
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
index 7c8169d0a52402bf918c924b37d8125da6c9e432..5fb5df32c77d74e6ec7dfeb654f78e1ac4f556c9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-23:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422799
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7d:46
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.123
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:23"
-      rate: 1000000000
-      mac: 00:09:3d:12:7d:47
-      ip6: fe80::209:3dff:fe12:7d47
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.23
-    bmc:
-      mac: 00:09:3d:12:7d:48
-      ip: 172.17.49.23
-  chassis:
-    serial: XG052422799
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:7d:47
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   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-24.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
index 0d2ae47c04aa4d5ca1fc36e480fd5011ebcd47ac..e51bb0d33640e53642b52f3d1802802385818851 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-24:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052420563
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:50:85
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.124
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:24"
-      rate: 1000000000
-      mac: 00:09:3d:12:50:86
-      ip6: fe80::209:3dff:fe12:5086
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.24
-    bmc:
-      mac: 00:09:3d:12:50:87
-      ip: 172.17.49.24
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052420563
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:50:86
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  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-27.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
index 90da243c3f3cfb5f1c0c9307f094c8c0cab7cdf9..6a0a0b4f369fa402388bc77898d10dde46f46d58 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-27:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052310144
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:6a:f0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.127
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:27"
-      rate: 1000000000
-      mac: 00:09:3d:12:6a:f1
-      ip6: fe80::209:3dff:fe12:6af1
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.27
-    bmc:
-      mac: 00:09:3d:12:6a:f2
-      ip: 172.17.49.27
-  chassis:
-    serial: XG052310144
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:6a:f1
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  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-29.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
index b169d9581fbbb234d652e34713aaa8d7d7ad343f..99b59ff7912494fcd4554e095f4bb9163b040c13 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-29:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052423610
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:e9:fe
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.129
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:29"
-      rate: 1000000000
-      mac: 00:09:3d:11:e9:ff
-      ip6: fe80::209:3dff:fe11:e9ff
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.29
-    bmc:
-      mac: 00:09:3d:11:ea:00
-      ip: 172.17.49.29
-  chassis:
-    serial: XG052423610
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:11:e9:ff
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      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-3.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
index b904e930cda047219f0bdb3679005c6cc5f96aec..6ca8a344344621bd298bdc436fd156d56b2f71d0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-3:
+  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: XG052428996
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:91:66
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.103
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:3"
-      rate: 1000000000
-      mac: 00:09:3d:12:91:67
-      ip6: fe80::209:3dff:fe12:9167
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.3
-    bmc:
-      mac: 00:09:3d:12:91:68
-      ip: 172.17.49.3
+      mac: 00:09:3d:12:91:67
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052428996
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
   supported_job_types:
     virtual: false
-  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-30.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
index 5887d7d47f27af74f6afc70492e6e57facac744e..a136ab47f63c22cfb01df856ec671aa516a994d4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-30:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052429073
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7c:93
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.130
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:30"
-      rate: 1000000000
-      mac: 00:09:3d:12:7c:94
-      ip6: fe80::209:3dff:fe12:7c94
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.30
-    bmc:
-      mac: 00:09:3d:12:7c:95
-      ip: 172.17.49.30
+      mac: 00:09:3d:12:7c:94
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052429073
-    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-31.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
index e20ab01e2080f580ca3ba9be9e0ad9b53b289ed1..3918f8d2c35ac792cb137080b55cd7d5429bcc7c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-31.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-31:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG062972165
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:c9:0c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.131
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:31"
-      rate: 1000000000
-      mac: 00:09:3d:12:c9:0e
-      ip6: fe80::209:3dff:fe12:c90e
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.31
-    bmc:
-      mac: 00:09:3d:12:c9:0f
-      ip: 172.17.49.31
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:c9:0e
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG062972165
-    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-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
index 2ebb6ca3cc574b0956dec0231db29afeca568323..f4db0207448c6c6d1339da005a9d2411849f7065 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-32:
+  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: XG052536375
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:a5:74
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.132
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:32"
-      rate: 1000000000
-      mac: 00:09:3d:12:a5:75
-      ip6: fe80::209:3dff:fe12:a575
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.32
-    bmc:
-      mac: 00:09:3d:12:a5:76
-      ip: 172.17.49.32
+      mac: 00:09:3d:12:a5:75
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052536375
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
   supported_job_types:
     virtual: false
-  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-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
index 128b83a9aa3ac9ec38adc581f06be8917a568f1c..53b0deaa325401b2298fcf2e82214afed07d2e0e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-33:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052536398
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:92:70
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.133
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:33"
-      rate: 1000000000
-      mac: 00:09:3d:12:92:71
-      ip6: fe80::209:3dff:fe12:9271
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.33
-    bmc:
-      mac: 00:09:3d:12:92:72
-      ip: 172.17.49.33
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052536398
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:92:71
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  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-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
index fdbc22a6335f5776c3411f67f66dc4d258c08cb2..1158b095a0311d21fabb400499557735d7f6cf27 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-34:
+  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: XG052536349
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:a4:ee
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.134
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:34"
-      rate: 1000000000
-      mac: 00:09:3d:12:a4:ef
-      ip6: fe80::209:3dff:fe12:a4ef
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.34
-    bmc:
-      mac: 00:09:3d:12:a4:f0
-      ip: 172.17.49.34
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:a4:ef
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052536349
-    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-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
index 1aad38486e9d5784fbbce859c470abfc7268325b..412bcadce35fecd522e55f412f64c4bb3107181d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-38:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052423602
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:38:6a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.138
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:38"
-      rate: 1000000000
-      mac: 00:09:3d:12:38:6b
-      ip6: fe80::209:3dff:fe12:386b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.38
-    bmc:
-      mac: 00:09:3d:12:38:6c
-      ip: 172.17.49.38
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:38:6b
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052423602
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
index 6af53403f648b380fb65706580602b50832740ee..a03d9bcb5781f4373b0b395a327aa1f42ed59c19 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-39:
+  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: XG052420611
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:4f:18
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.139
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:39"
-      rate: 1000000000
-      mac: 00:09:3d:12:4f:19
-      ip6: fe80::209:3dff:fe12:4f19
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.39
-    bmc:
-      mac: 00:09:3d:12:4f:1a
-      ip: 172.17.49.39
+      mac: 00:09:3d:12:4f:19
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052420611
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-4.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
index e70e07cc1b993f4aec75becd08d49a864b086a6c..ffe881b6915f0020dc0fd4e8e491b9249ad19849 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -1,69 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-4:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052428995
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7e:bb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.104
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:4"
-      rate: 1000000000
-      mac: 00:09:3d:12:7e:bc
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.4
-    bmc:
-      mac: 00:09:3d:12:7e:bd
-      ip: 172.17.49.4
+      mac: 00:09:3d:12:7e:bc
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052428995
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
index 89db798ab9f5f8edba22bed1f6244e349f974eb1..9f3f266d73b307444c8c548f84dd37fb9ddebff1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-42:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052420624
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:74:d4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.142
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:42"
-      rate: 1000000000
-      mac: 00:09:3d:12:74:d5
-      ip6: fe80::209:3dff:fe12:74d5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.42
-    bmc:
-      mac: 00:09:3d:12:74:d6
-      ip: 172.17.49.42
+      mac: 00:09:3d:12:74:d5
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052420624
-    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-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
index b8f745120585087db80d0d8cad90897fbfbb0f8f..2f6343042fa21e4c91ab863b0b31dd555eb7a232 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -1,69 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-43:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422304
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:28:4f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.143
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:43"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:50
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.43
-    bmc:
-      mac: 00:09:3d:12:28:51
-      ip: 172.17.49.43
+      mac: 00:09:3d:12:28:50
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052422304
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
index 343c72d7ff5f8bffde852b1c7c635f6e084224cc..f19a824b532026f4b151b3aafe90c241d6b5911c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-44:
+  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: XG052536146
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:a4:b4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.144
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:44"
-      rate: 1000000000
-      mac: 00:09:3d:12:a4:b5
-      ip6: fe80::209:3dff:fe12:a4b5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.44
-    bmc:
-      mac: 00:09:3d:12:a4:b6
-      ip: 172.17.49.44
+      mac: 00:09:3d:12:a4:b5
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052536146
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
   supported_job_types:
     virtual: false
-  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-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
index 40e41fb395ca615abfe32cec105bc6a9dbe63fcf..043585f91305f50aa69042c267f635264d7835e2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-45:
+  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: XG052420619
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3c:61
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.145
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:45"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:62
-      ip6: fe80::209:3dff:fe12:3c62
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.45
-    bmc:
-      mac: 00:09:3d:12:3c:63
-      ip: 172.17.49.45
+      mac: 00:09:3d:12:3c:62
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052420619
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-46.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
index c977a5aa971e9e9322f9d51ef2b2f83ec452b088..2e63ba606c633869c9616cd304f304971ef85fc1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-46.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-46:
+  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: XG052536197
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:9d:e5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.146
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:46"
-      rate: 1000000000
-      mac: 00:09:3d:12:9d:e6
-      ip6: fe80::209:3dff:fe12:9de6
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.46
-    bmc:
-      mac: 00:09:3d:12:9d:e7
-      ip: 172.17.49.46
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:9d:e6
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  chassis:
-    serial: XG052536197
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
   supported_job_types:
     virtual: false
-  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-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
index 75e9c9f65622b2ceb4fe50fa032c3a9737e8873c..0513e029661aa83be1e2a0e56abd180c777503d7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-47:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052423591
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3c:03
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.147
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:47"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:04
-      ip6: fe80::209:3dff:fe12:3c04
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.47
-    bmc:
-      mac: 00:09:3d:12:3c:05
-      ip: 172.17.49.47
+      mac: 00:09:3d:12:3c:04
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052423591
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
index f2e59c85f0a060a3c755c9a10acf336f76a43e8b..f8bf9f308a12d6b32f2fa0a4b764ad96fa86886e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-48:
+  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: XG052536400
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:92:f5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.148
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:48"
-      rate: 1000000000
-      mac: 00:09:3d:12:92:f6
-      ip6: fe80::209:3dff:fe12:92f6
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.48
-    bmc:
-      mac: 00:09:3d:12:92:f7
-      ip: 172.17.49.48
+      mac: 00:09:3d:12:92:f6
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052536400
-    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-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
index c0f461d5c238c5cb0e8dd6505a70a129f44ddc85..e1ce709383ea351c6bc5326652ed0b92895bfc4b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-49:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052420599
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3b:dd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.149
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:1"
-      rate: 1000000000
-      mac: 00:09:3d:12:3b:de
-      ip6: fe80::209:3dff:fe12:3bde
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.49
-    bmc:
-      mac: 00:09:3d:12:3b:df
-      ip: 172.17.49.49
+      mac: 00:09:3d:12:3b:de
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
-  chassis:
-    serial: XG052420599
-    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_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-5.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
index 566fe125cee61770ef5599da30ceea1111cd0295..92858eeda4d919b2f613ada9682c1813b40bdfe9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-5:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052080174
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3b:79
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.105
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:5"
-      rate: 1000000000
-      mac: 00:09:3d:12:3b:7a
-      ip6: fe80::209:3dff:fe12:3b7a
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.5
-    bmc:
-      mac: 00:09:3d:12:3b:7b
-      ip: 172.17.49.5
+      mac: 00:09:3d:12:3b:7a
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052080174
-    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-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
index ac768f051faefe6c163907450942a64db1a386cf..2aa585ebc3593fbb34f4e2e98403d2c06c8d5f6c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-50:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052423649
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:69:b7
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.150
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:2"
-      rate: 1000000000
-      mac: 00:09:3d:12:69:b8
-      ip6: fe80::209:3dff:fe12:69b8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.50
-    bmc:
-      mac: 00:09:3d:12:69:b9
-      ip: 172.17.49.50
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052423649
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:69:b8
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  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-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
index 58e6f9471c1ccf88d2bfa22e0cd7a1599b55963a..20848fa41c9700894fe5249b6e0978a503081837 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-51:
+  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: XG052420601
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3c:70
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.151
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:3"
-      rate: 1000000000
-      mac: 00:09:3d:12:3c:71
-      ip6: fe80::209:3dff:fe12:3c71
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.51
-    bmc:
-      mac: 00:09:3d:12:3c:72
-      ip: 172.17.49.51
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:3c:71
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052420601
-    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-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
index 874b7f5c4eb51ed92d45f46cba747f2406aec5f8..d80af717b5950ddbd270225fb9e7e57045118431 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-52:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422284
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:27:66
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.152
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:4"
-      rate: 1000000000
-      mac: 00:09:3d:12:27:67
-      ip6: fe80::209:3dff:fe12:2767
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.52
-    bmc:
-      mac: 00:09:3d:12:27:68
-      ip: 172.17.49.52
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:27:67
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052422284
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
index a1c4dba54fcee51ff337d397ce2d5fba04b84868..e0fc88c042ebb87541066950a0056d1aba9eb584 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-53:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052536172
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:9d:8b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.153
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:5"
-      rate: 1000000000
-      mac: 00:09:3d:12:9d:8c
-      ip6: fe80::209:3dff:fe12:9d8c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.53
-    bmc:
-      mac: 00:09:3d:12:9d:8d
-      ip: 172.17.49.53
+      mac: 00:09:3d:12:9d:8c
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  chassis:
-    serial: XG052536172
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
   supported_job_types:
     virtual: false
-  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-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
index 1057d1a86aea0b9e59a7b03db41e314afd36bdad..9a88ba59406fc0e55ff25000d3a24ff4538471b4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -1,69 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-54:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052536363
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:92:61
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.154
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:6"
-      rate: 1000000000
-      mac: 00:09:3d:12:92:62
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.54
-    bmc:
-      mac: 00:09:3d:12:92:63
-      ip: 172.17.49.54
+      mac: 00:09:3d:12:92:62
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052536363
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
index de4a4b7d2905a9e173123e9ba31669bae8ebe5bd..426e0f9551182c6892a35a3989043c57ac17ac0d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-55:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052310093
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:68:a9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.155
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:7"
-      rate: 1000000000
-      mac: 00:09:3d:12:68:aa
-      ip6: fe80::209:3dff:fe12:68aa
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.55
-    bmc:
-      mac: 00:09:3d:12:68:ab
-      ip: 172.17.49.55
+      mac: 00:09:3d:12:68:aa
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
-  chassis:
-    serial: XG052310093
-    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_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-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
index 02b9cb03da4625124c845796fcc3e90dd3485817..6f7027719ab0798032e9555d8847f0dfebeea7f3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-56:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052291009
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:5a:d6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.156
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:8"
-      rate: 1000000000
-      mac: 00:09:3d:12:5a:d7
-      ip6: fe80::209:3dff:fe12:5ad7
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.56
-    bmc:
-      mac: 00:09:3d:12:5a:d8
-      ip: 172.17.49.56
+      mac: 00:09:3d:12:5a:d7
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052291009
-    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-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
index 14dbb8f84cbb8a9263699ddcf9bd06ece3c83a95..98a0efa87a391c97ab48df5abca1dc4b783f735f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-57:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052310153
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:62:ee
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.157
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:9"
-      rate: 1000000000
-      mac: 00:09:3d:12:62:ef
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.57
-    bmc:
-      mac: 00:09:3d:12:62:f0
-      ip: 172.17.49.57
+      mac: 00:09:3d:12:62:ef
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052310153
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
index 1d74ace119426f7f7a5576f81004b66a656aa99d..6e9bd177c5b2c16d58cfd0d3d828cd1423fc0f47 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-58:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052310087
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:68:67
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.158
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:10"
-      rate: 1000000000
-      mac: 00:09:3d:12:68:68
-      ip6: fe80::209:3dff:fe12:6868
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.58
-    bmc:
-      mac: 00:09:3d:12:68:69
-      ip: 172.17.49.58
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052310087
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:68:68
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      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-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
index 3ac689a64e1548c71c65ad11cfd1deca3bf37c29..919c5c0a572dc04934db6ebbbf3a0c7a063a6786 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-59:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052081174
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:29:f8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.159
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:11"
-      rate: 1000000000
-      mac: 00:09:3d:12:29:f9
-      ip6: fe80::209:3dff:fe12:29f9
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.59
-    bmc:
-      mac: 00:09:3d:12:29:fa
-      ip: 172.17.49.59
+      mac: 00:09:3d:12:29:f9
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052081174
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-6.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
index 4e54c538271b73da400b6f123558f7f89d13eec5..2359fdd9ca4ce995e36e26af7079bd27f15ed74c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-6:
+  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: XG052310124
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:3e:ea
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.106
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:6"
-      rate: 1000000000
-      mac: 00:09:3d:12:3e:eb
-      ip6: fe80::209:3dff:fe12:3eeb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.6
-    bmc:
-      mac: 00:09:3d:12:3e:ec
-      ip: 172.17.49.6
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:3e:eb
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052310124
-    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-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
index c111a2f3057abc16450e4c3c5547ddcf6479de2c..d9339f4c7915e2a98d8e51c4484a39eb65c64830 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-61:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052291007
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:5d:fa
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.161
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:13"
-      rate: 1000000000
-      mac: 00:09:3d:12:5d:fb
-      ip6: fe80::209:3dff:fe12:5dfb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.61
-    bmc:
-      mac: 00:09:3d:12:5d:fc
-      ip: 172.17.49.61
+      mac: 00:09:3d:12:5d:fb
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052291007
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
index 3eaf36ce524ecee196e3a564394bf9a05bf3ac18..b29eec6d4991415621796a14b922b2da694603ac 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-63:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052291036
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:5e:fb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.163
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:15"
-      rate: 1000000000
-      mac: 00:09:3d:12:5e:fc
-      ip6: fe80::209:3dff:fe12:5efc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.63
-    bmc:
-      mac: 00:09:3d:12:5e:fd
-      ip: 172.17.49.63
+      mac: 00:09:3d:12:5e:fc
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052291036
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
-  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-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
index cafb67e684020cdc0c2722d478c7791cf1522d11..0597fb0a60b17ecf500e56c702f3d391a2edb673 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-64:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052291045
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:31:7c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.164
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:16"
-      rate: 1000000000
-      mac: 00:09:3d:12:31:7d
-      ip6: fe80::209:3dff:fe12:317d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.64
-    bmc:
-      mac: 00:09:3d:12:31:7e
-      ip: 172.17.49.64
-  chassis:
-    serial: XG052291045
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:31:7d
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   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-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
index 64af1750c552fc320b7d2b74c130ea6a05a16155..e8498bee623c615f8a427941306d0a10b5ddb639 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-65:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422296
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:28:01
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.165
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:17"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:02
-      ip6: fe80::209:3dff:fe12:2802
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.65
-    bmc:
-      mac: 00:09:3d:12:28:03
-      ip: 172.17.49.65
+      mac: 00:09:3d:12:28:02
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052422296
-    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-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
index 00caa50183143a1d9c6cd76a50a36f1d2705644d..5531b2708dacabe080989367430bb867729ccb4e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-66:
+  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: XG052420562
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:30:5e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.166
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:18"
-      rate: 1000000000
-      mac: 00:09:3d:12:30:5f
-      ip6: fe80::209:3dff:fe12:305f
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.66
-    bmc:
-      mac: 00:09:3d:12:30:60
-      ip: 172.17.49.66
+      mac: 00:09:3d:12:30:5f
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052420562
-    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-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
index b29b9ec5af1759401ed98c042f7b2ddef2cbd271..0ad4f8f47553d0a3ea7a343240df7515b0c13d14 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-67:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422292
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:28:a9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.167
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:19"
-      rate: 1000000000
-      mac: 00:09:3d:12:28:aa
-      ip6: fe80::209:3dff:fe12:28aa
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.67
-    bmc:
-      mac: 00:09:3d:12:28:ab
-      ip: 172.17.49.67
-  chassis:
-    serial: XG052422292
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:28:aa
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   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-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
index 016f4b43244c5219096942c82c37824522cafd8a..b73db3492c152c2a022051b41d8d75b502d1dce7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-69:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052423581
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:40:a1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.169
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:21"
-      rate: 1000000000
-      mac: 00:09:3d:12:40:a2
-      ip6: fe80::209:3dff:fe12:40a2
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.69
-    bmc:
-      mac: 00:09:3d:12:40:a3
-      ip: 172.17.49.69
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mac: 00:09:3d:12:40:a2
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052423581
-    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-7.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
index f255f03aa454e99faae20fffdc80a0557e857806..5feea08bd97ac438153b7e3052aea2ef2ce000f6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-7.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-7:
+  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: MAT3073NC
-      device: sda
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052422741
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7f:e9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.107
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:7"
-      rate: 1000000000
-      mac: 00:09:3d:12:7f:ea
-      ip6: fe80::209:3dff:fe12:7fea
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.7
-    bmc:
-      mac: 00:09:3d:12:7f:eb
-      ip: 172.17.49.7
-  chassis:
-    serial: XG052422741
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:12:7f:ea
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  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-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
index f577cf15b67d4ceba02b2c093811f200ccccf22b..01626d75de1088966b9faf5e01ad407a8e84bf97 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -1,69 +1,45 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-71:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083258
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:db:b1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.171
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:23"
-      rate: 1000000000
-      mac: 00:09:3d:11:db:b2
-      ip6: fe80::209:3dff:fe11:dbb2
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.71
-    bmc:
-      mac: 00:09:3d:11:db:b3
-      ip: 172.17.49.71
+      mac: 00:09:3d:11:db:b2
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: ST373207LC
       device: sda
+      model: ST373207LC
+      rev: 2.0
       size: 73407868928
-      rev: 2
     sdb:
-      model: MAT3073NC
       device: sdb
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052083258
-    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-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
index 0e3257a860706670386de0acf281046f579a585c..2fda20155656da0659fac021ffb0ece00198cc97 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -1,69 +1,45 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-72:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083198
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:ae:fc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.172
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:24"
-      rate: 1000000000
-      mac: 00:09:3d:11:ae:fd
-      ip6: fe80::209:3dff:fe11:aefd
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.72
-    bmc:
-      mac: 00:09:3d:11:ae:fe
-      ip: 172.17.49.72
-  chassis:
-    serial: XG052083198
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:11:ae:fd
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
+    sdb:
+      device: sdb
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  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: 17179869184
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
index 666ec5542413cd5c2137c0037269413cddea5276..07e5b74d03bc596c619095ef0aacfec5435d7b43 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -1,69 +1,45 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-74:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083265
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:db:ab
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.174
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:26"
-      rate: 1000000000
-      mac: 00:09:3d:11:db:ac
-      ip6: fe80::209:3dff:fe11:dbac
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.74
-    bmc:
-      mac: 00:09:3d:11:db:ad
-      ip: 172.17.49.74
-  chassis:
-    serial: XG052083265
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:11:db:ac
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
+    sdb:
+      device: sdb
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  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-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
index ada8322aeab295446dd7b83bc93cc3ccb11719a8..e3e555cde854f7b2aa38695081af60eeca31a670 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -1,69 +1,45 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-75:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: ST373207LC
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083161
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:95:21
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.175
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:27"
-      rate: 1000000000
-      mac: 00:09:3d:11:95:22
-      ip6: fe80::209:3dff:fe11:9522
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.75
-    bmc:
-      mac: 00:09:3d:11:95:23
-      ip: 172.17.49.75
+      mac: 00:09:3d:11:95:22
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
+    sdb:
+      device: sdb
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  chassis:
-    serial: XG052083161
-    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-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
index 21dace678984534c685db7124b265894631ab308..b574c5feda3c040d61587b7ac2ccd1e9f21c7e99 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -1,69 +1,45 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-78:
+  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
-      device: sda
-      size: 73407868928
-      rev: 2
-    sdb:
-      model: MAT3073NC
-      device: sdb
-      size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: V1.35.2.2
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire V20z
+    serial: XG052083164
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:11:12:2b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.178
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "2:30"
-      rate: 1000000000
-      mac: 00:09:3d:11:12:2c
-      ip6: fe80::209:3dff:fe11:122c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.78
-    bmc:
-      mac: 00:09:3d:11:12:2d
-      ip: 172.17.49.78
-  chassis:
-    serial: XG052083164
-    manufacturer: Sun Microsystems
-    name: Sun Fire V20z
+      mac: 00:09:3d:11:12:2c
+      management: false
+      mounted: true
+      rate: 1000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST373207LC
+      rev: 2.0
+      size: 73407868928
+    sdb:
+      device: sdb
+      model: MAT3073NC
+      rev: 104.0
+      size: 73543163904
   supported_job_types:
     virtual: false
-  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: 17179869184
-  architecture:
-    platform_type: x86_64
-    smt_size: 2
-    smp_size: 2
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
index b50a8004d44593bcf83b039fbf47518985c3335a..27e89177f82ca98d1634c6da12cfb7ede1ebeaa0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -1,64 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sagittaire-9:
+  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: XG052422764
+  main_memory:
+    ram_size: 2107637760
   network_adapters:
     eth0:
-      mounted: false
+      driver: tg3
+      interface: Ethernet
       mac: 00:09:3d:12:7f:da
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: tg3
-      mountable: false
-      ip: 172.16.49.109
+      mounted: false
     eth1:
-      mounted: true
-      switch_port: "1:9"
-      rate: 1000000000
-      mac: 00:09:3d:12:7f:db
-      ip6: fe80::209:3dff:fe12:7fdb
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: tg3
-      mountable: true
+      interface: Ethernet
       ip: 172.16.49.9
-    bmc:
-      mac: 00:09:3d:12:7f:dc
-      ip: 172.17.49.9
+      mac: 00:09:3d:12:7f:db
+      management: false
+      mounted: true
+      rate: 1000000000
   storage_devices:
     sda:
-      model: MAT3073NC
       device: sda
+      model: MAT3073NC
+      rev: 104.0
       size: 73543163904
-      rev: 104
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: XG052422764
-    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_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/sagittaire_diff.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..40929b2fd5f4394d0d9d311370b15092ee154b82
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire_diff.yaml
@@ -0,0 +1,770 @@
+---
+nodes:
+  sagittaire-[1-79]:
+    network_adapters:
+      eth0:
+        enabled: false
+        mountable: false
+      eth1:
+        enabled: true
+        mountable: true
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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
+
+  sagittaire-1:
+    chassis:
+      serial: XG052536201
+    network_adapters:
+      bmc:
+        ip: 172.17.49.1
+        mac: 00:09:3d:12:9e:15
+      eth0:
+        ip: 172.16.49.101
+      eth1:
+        ip6: fe80::209:3dff:fe12:9e14
+        switch_port: '1:1'
+  sagittaire-11:
+    chassis:
+      serial: XG052536163
+    network_adapters:
+      bmc:
+        ip: 172.17.49.11
+        mac: 00:09:3d:12:9e:0f
+      eth0:
+        ip: 172.16.49.111
+      eth1:
+        ip6: fe80::209:3dff:fe12:9e07
+        switch_port: '1:11'
+  sagittaire-12:
+    chassis:
+      serial: XG052423635
+    network_adapters:
+      bmc:
+        ip: 172.17.49.12
+        mac: 00:09:3d:12:3c:2d
+      eth0:
+        ip: 172.16.49.112
+      eth1:
+        ip6: fe80::209:3dff:fe12:3c2c
+        switch_port: '1:12'
+  sagittaire-13:
+    chassis:
+      serial: XG052428994
+    network_adapters:
+      bmc:
+        ip: 172.17.49.13
+        mac: 00:09:3d:12:91:62
+      eth0:
+        ip: 172.16.49.113
+      eth1:
+        ip6: fe80::209:3dff:fe12:9161
+        switch_port: '1:13'
+  sagittaire-14:
+    chassis:
+      serial: XG052080114
+    network_adapters:
+      bmc:
+        ip: 172.17.49.14
+        mac: 00:09:3d:12:7a:be
+      eth0:
+        ip: 172.16.49.114
+      eth1:
+        ip6: fe80::209:3dff:fe12:7abd
+        switch_port: '1:14'
+  sagittaire-15:
+    chassis:
+      serial: XG052422326
+    network_adapters:
+      bmc:
+        ip: 172.17.49.15
+        mac: 00:09:3d:12:28:72
+      eth0:
+        ip: 172.16.49.115
+      eth1:
+        ip6: fe80::209:3dff:fe12:2871
+        switch_port: '1:15'
+  sagittaire-16:
+    chassis:
+      serial: XG052429007
+    network_adapters:
+      bmc:
+        ip: 172.17.49.16
+        mac: 00:09:3d:12:7d:08
+      eth0:
+        ip: 172.16.49.116
+      eth1:
+        ip6: fe80::209:3dff:fe12:7d07
+        switch_port: '1:16'
+  sagittaire-17:
+    chassis:
+      serial: XG052081146
+    network_adapters:
+      bmc:
+        ip: 172.17.49.17
+        mac: 00:09:3d:11:e7:64
+      eth0:
+        ip: 172.16.49.117
+      eth1:
+        ip6: fe80::209:3dff:fe11:e763
+        switch_port: '1:17'
+  sagittaire-18:
+    chassis:
+      serial: XG052429080
+    network_adapters:
+      bmc:
+        ip: 172.17.49.18
+        mac: 00:09:3d:12:7e:f3
+      eth0:
+        ip: 172.16.49.118
+      eth1:
+        ip6: fe80::209:3dff:fe12:7ef2
+        switch_port: '1:18'
+  sagittaire-19:
+    chassis:
+      serial: XG052428991
+    network_adapters:
+      bmc:
+        ip: 172.17.49.19
+        mac: 00:09:3d:12:90:58
+      eth0:
+        ip: 172.16.49.119
+      eth1:
+        ip6: fe80::209:3dff:fe12:9057
+        switch_port: '1:19'
+  sagittaire-2:
+    chassis:
+      serial: XG052310079
+    network_adapters:
+      bmc:
+        ip: 172.17.49.2
+        mac: 00:09:3d:12:65:7e
+      eth0:
+        ip: 172.16.49.102
+      eth1:
+        ip6: fe80::209:3dff:fe12:657d
+        switch_port: '1:2'
+  sagittaire-20:
+    chassis:
+      serial: XG052428987
+    network_adapters:
+      bmc:
+        ip: 172.17.49.20
+        mac: 00:09:3d:12:90:85
+      eth0:
+        ip: 172.16.49.120
+      eth1:
+        ip6: fe80::209:3dff:fe12:9084
+        switch_port: '1:20'
+  sagittaire-22:
+    chassis:
+      serial: XG052429001
+    network_adapters:
+      bmc:
+        ip: 172.17.49.22
+        mac: 00:09:3d:12:90:a0
+      eth0:
+        ip: 172.16.49.122
+      eth1:
+        ip6: fe80::209:3dff:fe11:9522
+        switch_port: '1:22'
+    storage_devices:
+      sdb:
+        device: sdb
+        model: MAT3073NC
+        rev: 104
+        size: 73543163904
+  sagittaire-23:
+    chassis:
+      serial: XG052422799
+    network_adapters:
+      bmc:
+        ip: 172.17.49.23
+        mac: 00:09:3d:12:7d:48
+      eth0:
+        ip: 172.16.49.123
+      eth1:
+        ip6: fe80::209:3dff:fe12:7d47
+        switch_port: '1:23'
+  sagittaire-24:
+    chassis:
+      serial: XG052420563
+    network_adapters:
+      bmc:
+        ip: 172.17.49.24
+        mac: 00:09:3d:12:50:87
+      eth0:
+        ip: 172.16.49.124
+      eth1:
+        ip6: fe80::209:3dff:fe12:5086
+        switch_port: '1:24'
+  sagittaire-27:
+    chassis:
+      serial: XG052310144
+    network_adapters:
+      bmc:
+        ip: 172.17.49.27
+        mac: 00:09:3d:12:6a:f2
+      eth0:
+        ip: 172.16.49.127
+      eth1:
+        ip6: fe80::209:3dff:fe12:6af1
+        switch_port: '1:27'
+  sagittaire-29:
+    chassis:
+      serial: XG052423610
+    network_adapters:
+      bmc:
+        ip: 172.17.49.29
+        mac: 00:09:3d:11:ea:00
+      eth0:
+        ip: 172.16.49.129
+      eth1:
+        ip6: fe80::209:3dff:fe11:e9ff
+        switch_port: '1:29'
+  sagittaire-3:
+    chassis:
+      serial: XG052428996
+    network_adapters:
+      bmc:
+        ip: 172.17.49.3
+        mac: 00:09:3d:12:91:68
+      eth0:
+        ip: 172.16.49.103
+      eth1:
+        ip6: fe80::209:3dff:fe12:9167
+        switch_port: '1:3'
+  sagittaire-30:
+    chassis:
+      serial: XG052429073
+    network_adapters:
+      bmc:
+        ip: 172.17.49.30
+        mac: 00:09:3d:12:7c:95
+      eth0:
+        ip: 172.16.49.130
+      eth1:
+        ip6: fe80::209:3dff:fe12:7c94
+        switch_port: '1:30'
+  sagittaire-31:
+    chassis:
+      serial: XG062972165
+    network_adapters:
+      bmc:
+        ip: 172.17.49.31
+        mac: 00:09:3d:12:c9:0f
+      eth0:
+        ip: 172.16.49.131
+      eth1:
+        ip6: fe80::209:3dff:fe12:c90e
+        switch_port: '1:31'
+  sagittaire-32:
+    chassis:
+      serial: XG052536375
+    network_adapters:
+      bmc:
+        ip: 172.17.49.32
+        mac: 00:09:3d:12:a5:76
+      eth0:
+        ip: 172.16.49.132
+      eth1:
+        ip6: fe80::209:3dff:fe12:a575
+        switch_port: '1:32'
+  sagittaire-33:
+    chassis:
+      serial: XG052536398
+    network_adapters:
+      bmc:
+        ip: 172.17.49.33
+        mac: 00:09:3d:12:92:72
+      eth0:
+        ip: 172.16.49.133
+      eth1:
+        ip6: fe80::209:3dff:fe12:9271
+        switch_port: '1:33'
+  sagittaire-34:
+    chassis:
+      serial: XG052536349
+    network_adapters:
+      bmc:
+        ip: 172.17.49.34
+        mac: 00:09:3d:12:a4:f0
+      eth0:
+        ip: 172.16.49.134
+      eth1:
+        ip6: fe80::209:3dff:fe12:a4ef
+        switch_port: '1:34'
+  sagittaire-38:
+    chassis:
+      serial: XG052423602
+    network_adapters:
+      bmc:
+        ip: 172.17.49.38
+        mac: 00:09:3d:12:38:6c
+      eth0:
+        ip: 172.16.49.138
+      eth1:
+        ip6: fe80::209:3dff:fe12:386b
+        switch_port: '1:38'
+  sagittaire-39:
+    chassis:
+      serial: XG052420611
+    network_adapters:
+      bmc:
+        ip: 172.17.49.39
+        mac: 00:09:3d:12:4f:1a
+      eth0:
+        ip: 172.16.49.139
+      eth1:
+        ip6: fe80::209:3dff:fe12:4f19
+        switch_port: '1:39'
+  sagittaire-4:
+    chassis:
+      serial: XG052428995
+    network_adapters:
+      bmc:
+        ip: 172.17.49.4
+        mac: 00:09:3d:12:7e:bd
+      eth0:
+        ip: 172.16.49.104
+      eth1:
+        ip6: fe80::209:3dff:fe11:9522
+        switch_port: '1:4'
+    storage_devices:
+      sdb:
+        device: sdb
+        model: MAT3073NC
+        rev: 104
+        size: 73543163904
+  sagittaire-42:
+    chassis:
+      serial: XG052420624
+    network_adapters:
+      bmc:
+        ip: 172.17.49.42
+        mac: 00:09:3d:12:74:d6
+      eth0:
+        ip: 172.16.49.142
+      eth1:
+        ip6: fe80::209:3dff:fe12:74d5
+        switch_port: '1:42'
+  sagittaire-43:
+    chassis:
+      serial: XG052422304
+    network_adapters:
+      bmc:
+        ip: 172.17.49.43
+        mac: 00:09:3d:12:28:51
+      eth0:
+        ip: 172.16.49.143
+      eth1:
+        ip6: fe80::209:3dff:fe11:9522
+        switch_port: '1:43'
+    storage_devices:
+      sdb:
+        device: sdb
+        model: MAT3073NC
+        rev: 104
+        size: 73543163904
+  sagittaire-44:
+    chassis:
+      serial: XG052536146
+    network_adapters:
+      bmc:
+        ip: 172.17.49.44
+        mac: 00:09:3d:12:a4:b6
+      eth0:
+        ip: 172.16.49.144
+      eth1:
+        ip6: fe80::209:3dff:fe12:a4b5
+        switch_port: '1:44'
+  sagittaire-45:
+    chassis:
+      serial: XG052420619
+    network_adapters:
+      bmc:
+        ip: 172.17.49.45
+        mac: 00:09:3d:12:3c:63
+      eth0:
+        ip: 172.16.49.145
+      eth1:
+        ip6: fe80::209:3dff:fe12:3c62
+        switch_port: '1:45'
+  sagittaire-46:
+    chassis:
+      serial: XG052536197
+    network_adapters:
+      bmc:
+        ip: 172.17.49.46
+        mac: 00:09:3d:12:9d:e7
+      eth0:
+        ip: 172.16.49.146
+      eth1:
+        ip6: fe80::209:3dff:fe12:9de6
+        switch_port: '1:46'
+  sagittaire-47:
+    chassis:
+      serial: XG052423591
+    network_adapters:
+      bmc:
+        ip: 172.17.49.47
+        mac: 00:09:3d:12:3c:05
+      eth0:
+        ip: 172.16.49.147
+      eth1:
+        ip6: fe80::209:3dff:fe12:3c04
+        switch_port: '1:47'
+  sagittaire-48:
+    chassis:
+      serial: XG052536400
+    network_adapters:
+      bmc:
+        ip: 172.17.49.48
+        mac: 00:09:3d:12:92:f7
+      eth0:
+        ip: 172.16.49.148
+      eth1:
+        ip6: fe80::209:3dff:fe12:92f6
+        switch_port: '1:48'
+  sagittaire-49:
+    chassis:
+      serial: XG052420599
+    network_adapters:
+      bmc:
+        ip: 172.17.49.49
+        mac: 00:09:3d:12:3b:df
+      eth0:
+        ip: 172.16.49.149
+      eth1:
+        ip6: fe80::209:3dff:fe12:3bde
+        switch_port: '2:1'
+  sagittaire-5:
+    chassis:
+      serial: XG052080174
+    network_adapters:
+      bmc:
+        ip: 172.17.49.5
+        mac: 00:09:3d:12:3b:7b
+      eth0:
+        ip: 172.16.49.105
+      eth1:
+        ip6: fe80::209:3dff:fe12:3b7a
+        switch_port: '1:5'
+  sagittaire-50:
+    chassis:
+      serial: XG052423649
+    network_adapters:
+      bmc:
+        ip: 172.17.49.50
+        mac: 00:09:3d:12:69:b9
+      eth0:
+        ip: 172.16.49.150
+      eth1:
+        ip6: fe80::209:3dff:fe12:69b8
+        switch_port: '2:2'
+  sagittaire-51:
+    chassis:
+      serial: XG052420601
+    network_adapters:
+      bmc:
+        ip: 172.17.49.51
+        mac: 00:09:3d:12:3c:72
+      eth0:
+        ip: 172.16.49.151
+      eth1:
+        ip6: fe80::209:3dff:fe12:3c71
+        switch_port: '2:3'
+  sagittaire-52:
+    chassis:
+      serial: XG052422284
+    network_adapters:
+      bmc:
+        ip: 172.17.49.52
+        mac: 00:09:3d:12:27:68
+      eth0:
+        ip: 172.16.49.152
+      eth1:
+        ip6: fe80::209:3dff:fe12:2767
+        switch_port: '2:4'
+  sagittaire-53:
+    chassis:
+      serial: XG052536172
+    network_adapters:
+      bmc:
+        ip: 172.17.49.53
+        mac: 00:09:3d:12:9d:8d
+      eth0:
+        ip: 172.16.49.153
+      eth1:
+        ip6: fe80::209:3dff:fe12:9d8c
+        switch_port: '2:5'
+  sagittaire-54:
+    chassis:
+      serial: XG052536363
+    network_adapters:
+      bmc:
+        ip: 172.17.49.54
+        mac: 00:09:3d:12:92:63
+      eth0:
+        ip: 172.16.49.154
+      eth1:
+        ip6: fe80::209:3dff:fe11:9522
+        switch_port: '2:6'
+    storage_devices:
+      sdb:
+        device: sdb
+        model: MAT3073NC
+        rev: 104
+        size: 73543163904
+  sagittaire-55:
+    chassis:
+      serial: XG052310093
+    network_adapters:
+      bmc:
+        ip: 172.17.49.55
+        mac: 00:09:3d:12:68:ab
+      eth0:
+        ip: 172.16.49.155
+      eth1:
+        ip6: fe80::209:3dff:fe12:68aa
+        switch_port: '2:7'
+  sagittaire-56:
+    chassis:
+      serial: XG052291009
+    network_adapters:
+      bmc:
+        ip: 172.17.49.56
+        mac: 00:09:3d:12:5a:d8
+      eth0:
+        ip: 172.16.49.156
+      eth1:
+        ip6: fe80::209:3dff:fe12:5ad7
+        switch_port: '2:8'
+  sagittaire-57:
+    chassis:
+      serial: XG052310153
+    network_adapters:
+      bmc:
+        ip: 172.17.49.57
+        mac: 00:09:3d:12:62:f0
+      eth0:
+        ip: 172.16.49.157
+      eth1:
+        ip6: fe80::209:3dff:fe11:9522
+        switch_port: '2:9'
+  sagittaire-58:
+    chassis:
+      serial: XG052310087
+    network_adapters:
+      bmc:
+        ip: 172.17.49.58
+        mac: 00:09:3d:12:68:69
+      eth0:
+        ip: 172.16.49.158
+      eth1:
+        ip6: fe80::209:3dff:fe12:6868
+        switch_port: '2:10'
+  sagittaire-59:
+    chassis:
+      serial: XG052081174
+    network_adapters:
+      bmc:
+        ip: 172.17.49.59
+        mac: 00:09:3d:12:29:fa
+      eth0:
+        ip: 172.16.49.159
+      eth1:
+        ip6: fe80::209:3dff:fe12:29f9
+        switch_port: '2:11'
+  sagittaire-6:
+    chassis:
+      serial: XG052310124
+    network_adapters:
+      bmc:
+        ip: 172.17.49.6
+        mac: 00:09:3d:12:3e:ec
+      eth0:
+        ip: 172.16.49.106
+      eth1:
+        ip6: fe80::209:3dff:fe12:3eeb
+        switch_port: '1:6'
+  sagittaire-61:
+    chassis:
+      serial: XG052291007
+    network_adapters:
+      bmc:
+        ip: 172.17.49.61
+        mac: 00:09:3d:12:5d:fc
+      eth0:
+        ip: 172.16.49.161
+      eth1:
+        ip6: fe80::209:3dff:fe12:5dfb
+        switch_port: '2:13'
+  sagittaire-63:
+    chassis:
+      serial: XG052291036
+    network_adapters:
+      bmc:
+        ip: 172.17.49.63
+        mac: 00:09:3d:12:5e:fd
+      eth0:
+        ip: 172.16.49.163
+      eth1:
+        ip6: fe80::209:3dff:fe12:5efc
+        switch_port: '2:15'
+  sagittaire-64:
+    chassis:
+      serial: XG052291045
+    network_adapters:
+      bmc:
+        ip: 172.17.49.64
+        mac: 00:09:3d:12:31:7e
+      eth0:
+        ip: 172.16.49.164
+      eth1:
+        ip6: fe80::209:3dff:fe12:317d
+        switch_port: '2:16'
+  sagittaire-65:
+    chassis:
+      serial: XG052422296
+    network_adapters:
+      bmc:
+        ip: 172.17.49.65
+        mac: 00:09:3d:12:28:03
+      eth0:
+        ip: 172.16.49.165
+      eth1:
+        ip6: fe80::209:3dff:fe12:2802
+        switch_port: '2:17'
+  sagittaire-66:
+    chassis:
+      serial: XG052420562
+    network_adapters:
+      bmc:
+        ip: 172.17.49.66
+        mac: 00:09:3d:12:30:60
+      eth0:
+        ip: 172.16.49.166
+      eth1:
+        ip6: fe80::209:3dff:fe12:305f
+        switch_port: '2:18'
+  sagittaire-67:
+    chassis:
+      serial: XG052422292
+    network_adapters:
+      bmc:
+        ip: 172.17.49.67
+        mac: 00:09:3d:12:28:ab
+      eth0:
+        ip: 172.16.49.167
+      eth1:
+        ip6: fe80::209:3dff:fe12:28aa
+        switch_port: '2:19'
+  sagittaire-69:
+    chassis:
+      serial: XG052423581
+    network_adapters:
+      bmc:
+        ip: 172.17.49.69
+        mac: 00:09:3d:12:40:a3
+      eth0:
+        ip: 172.16.49.169
+      eth1:
+        ip6: fe80::209:3dff:fe12:40a2
+        switch_port: '2:21'
+  sagittaire-7:
+    chassis:
+      serial: XG052422741
+    network_adapters:
+      bmc:
+        ip: 172.17.49.7
+        mac: 00:09:3d:12:7f:eb
+      eth0:
+        ip: 172.16.49.107
+      eth1:
+        ip6: fe80::209:3dff:fe12:7fea
+        switch_port: '1:7'
+  sagittaire-71:
+    chassis:
+      serial: XG052083258
+    network_adapters:
+      bmc:
+        ip: 172.17.49.71
+        mac: 00:09:3d:11:db:b3
+      eth0:
+        ip: 172.16.49.171
+      eth1:
+        ip6: fe80::209:3dff:fe11:dbb2
+        switch_port: '2:23'
+  sagittaire-72:
+    chassis:
+      serial: XG052083198
+    network_adapters:
+      bmc:
+        ip: 172.17.49.72
+        mac: 00:09:3d:11:ae:fe
+      eth0:
+        ip: 172.16.49.172
+      eth1:
+        ip6: fe80::209:3dff:fe11:aefd
+        switch_port: '2:24'
+  sagittaire-74:
+    chassis:
+      serial: XG052083265
+    network_adapters:
+      bmc:
+        ip: 172.17.49.74
+        mac: 00:09:3d:11:db:ad
+      eth0:
+        ip: 172.16.49.174
+      eth1:
+        ip6: fe80::209:3dff:fe11:dbac
+        switch_port: '2:26'
+  sagittaire-75:
+    chassis:
+      serial: XG052083161
+    network_adapters:
+      bmc:
+        ip: 172.17.49.75
+        mac: 00:09:3d:11:95:23
+      eth0:
+        ip: 172.16.49.175
+      eth1:
+        ip6: fe80::209:3dff:fe11:9522
+        switch_port: '2:27'
+  sagittaire-78:
+    chassis:
+      serial: XG052083164
+    network_adapters:
+      bmc:
+        ip: 172.17.49.78
+        mac: 00:09:3d:11:12:2d
+      eth0:
+        ip: 172.16.49.178
+      eth1:
+        ip6: fe80::209:3dff:fe11:122c
+        switch_port: '2:30'
+  sagittaire-9:
+    chassis:
+      serial: XG052422764
+    network_adapters:
+      bmc:
+        ip: 172.17.49.9
+        mac: 00:09:3d:12:7f:dc
+      eth0:
+        ip: 172.16.49.109
+      eth1:
+        ip6: fe80::209:3dff:fe12:7fdb
+        switch_port: '1:9'
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
index ccbbc975735096f9e1e4be7ca95a945f1daffb90..1cf0c6c5498f657bd5b5d6d8fc9245e5eabc58a7 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-11:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: JHTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/11
-      rate: 10000000000
-      mac: a0:36:9f:09:c2:30
-      ip6: fe80::a236:9fff:fe09:c230
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.11
+      mac: a0:36:9f:09:c2:30
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:09:c2:32
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:ff:9c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:ff:9d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:ff:9e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:ff:9f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:4a:a4
-      ip: 172.17.48.11
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
-  chassis:
-    serial_number: JHTHD5J
-    manufacturer: Dell Inc.
-    product_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/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index f8b0736885e0d81796ef67faf753a84ed3c82f64..463b8c5cd89de6d94031cf2b883f0f733de973be 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-12:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: GHTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/12
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:f4
-      ip6: fe80::a236:9fff:fe08:f8f4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.12
+      mac: a0:36:9f:08:f8:f4
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:f8:f6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:04:28
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:04:29
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:04:2a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:04:2b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ed:b8
-      ip: 172.17.48.12
-  chassis:
-    serial: GHTHD5J
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H710
+      rev: 3.13
+      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/lyon/clusters/taurus/nodes/taurus-15.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
index 54f2ec935b64c54392efe29acaebd2efd4f9629e..ec70991aac57511c236be7375ae2b84835145bf0 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 2.5
     release_date: 01/22/2016
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: 9HTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/15
-      rate: 10000000000
-      mac: a0:36:9f:09:c1:58
-      ip6: fe80::a236:9fff:fe09:c158
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.15
+      mac: a0:36:9f:09:c1:58
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:09:c1:5a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:10
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:11
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:12
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:13
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:f9:a3:6c
-      ip: 172.17.48.15
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H710
+      rev: 3.13
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial_number: 9HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  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_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
index eba5a5de06864436ca0dc104dbe3af9b6730ab23..664c91bc235a320889a1e800983420065c1735e5 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-16:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
-    version: 2.5
     release_date: 01/22/2016
     vendor: Dell Inc.
-  storage_devices:
-    sda:
-      model: PERC H710
-      device: sda
-      size: 598879502336
-      rev: 3.13
+    version: 2.5
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R720
+    serial: BHTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/16
-      rate: 10000000000
-      mac: a0:36:9f:08:f7:00
-      ip6: fe80::a236:9fff:fe08:f700
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.16
+      mac: a0:36:9f:08:f7:00
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:f7:02
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:32:14
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:32:15
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:32:16
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:32:17
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:f1:54
-      ip: 172.17.48.16
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: BHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H710
+      rev: 3.13
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
index 7e3075ec26cd2ece151399756bed86e9f61fcbf6..18d15b723a5a3bf8198fbda356d1277cdcd0fc3a 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-4:
+  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: FHTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/4
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:6c
-      ip6: fe80::a236:9fff:fe08:f86c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.4
+      mac: a0:36:9f:08:f8:6c
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:f8:6e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:2c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:2d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:2e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:23:2f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:e7:96
-      ip: 172.17.48.4
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial_number: FHTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  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_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
index 797a18730f44d1f802831ed2b152ea6eeaf7693b..6e7f0a8c4b888161c34714cf125eedaea8d2f198 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-5:
+  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: 5HTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/5
-      rate: 10000000000
-      mac: a0:36:9f:09:c3:24
-      ip6: fe80::a236:9fff:fe09:c324
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.5
+      mac: a0:36:9f:09:c3:24
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:09:c3:26
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:80
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:81
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:82
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:83
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:ed:38
-      ip: 172.17.48.5
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial_number: 5HTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
-  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/lyon/clusters/taurus/nodes/taurus-8.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
index c946e5111d839bf78c0425f9711bfc4e6f335d81..23f7160a03b628cf10ad1b76f54c623f34a27fd6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-8:
+  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: 3HTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/8
-      rate: 10000000000
-      mac: a0:36:9f:09:c0:14
-      ip6: fe80::a236:9fff:fe09:c2f8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.8
+      mac: a0:36:9f:09:c0:14
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:09:c0:16
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:b8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:b9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:ba
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ef:22:bb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fa:78:88
-      ip: 172.17.48.8
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
-  chassis:
-    serial_number: 3HTHD5J
-    manufacturer: Dell Inc.
-    product_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/lyon/clusters/taurus/nodes/taurus-9.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
index 87ef2f549d54a9a6c62538b93497c675a2b2419e..1a6ed65b154bf5e784a431ddaa1352f0ccd0f207 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -1,95 +1,64 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 taurus-9:
+  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: 1JTHD5J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      switch_port: TenGigabitEthernet 0/9
-      rate: 10000000000
-      mac: a0:36:9f:08:f8:48
-      ip6: fe80::a236:9fff:fe08:f848
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: ixgbe
-      mountable: true
+      interface: Ethernet
       ip: 172.16.48.9
+      mac: a0:36:9f:08:f8:48
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      mounted: false
+      driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:08:f8:4a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: ixgbe
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:fd:f8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:fd:f9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth4:
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:fd:fa
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth5:
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
       mac: bc:30:5b:ee:fd:fb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: d4:be:d9:fb:50:78
-      ip: 172.17.48.9
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC H710
       device: sda
-      size: 598879502336
+      model: PERC H710
       rev: 3.13
-  chassis:
-    serial_number: 1JTHD5J
-    manufacturer: Dell Inc.
-    product_name: PowerEdge R720
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 15728640
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 12
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_diff.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..654b46bbe0a8486aa3f7c6522b73191aafc4c60a
--- /dev/null
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_diff.yaml
@@ -0,0 +1,106 @@
+---
+nodes:
+  taurus-[-]:
+    chassis:
+      product_name: PowerEdge R720
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        mountable: false
+      eth3:
+        enabled: false
+        mountable: false
+      eth4:
+        enabled: false
+        mountable: false
+      eth5:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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
+
+  taurus-11:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.11
+        mac: d4:be:d9:fb:4a:a4
+      eth0:
+        ip6: fe80::a236:9fff:fe09:c230
+        switch_port: TenGigabitEthernet 0/11
+  taurus-12:
+    chassis:
+      serial: GHTHD5J
+    network_adapters:
+      bmc:
+        ip: 172.17.48.12
+        mac: d4:be:d9:fb:ed:b8
+      eth0:
+        ip6: fe80::a236:9fff:fe08:f8f4
+        switch_port: TenGigabitEthernet 0/12
+  taurus-15:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.15
+        mac: d4:be:d9:f9:a3:6c
+      eth0:
+        ip6: fe80::a236:9fff:fe09:c158
+        switch_port: TenGigabitEthernet 0/15
+  taurus-16:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.16
+        mac: d4:be:d9:fb:f1:54
+      eth0:
+        ip6: fe80::a236:9fff:fe08:f700
+        switch_port: TenGigabitEthernet 0/16
+  taurus-4:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.4
+        mac: d4:be:d9:fb:e7:96
+      eth0:
+        ip6: fe80::a236:9fff:fe08:f86c
+        switch_port: TenGigabitEthernet 0/4
+  taurus-5:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.5
+        mac: d4:be:d9:fb:ed:38
+      eth0:
+        ip6: fe80::a236:9fff:fe09:c324
+        switch_port: TenGigabitEthernet 0/5
+  taurus-8:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.8
+        mac: d4:be:d9:fa:78:88
+      eth0:
+        ip6: fe80::a236:9fff:fe09:c2f8
+        switch_port: TenGigabitEthernet 0/8
+  taurus-9:
+    network_adapters:
+      bmc:
+        ip: 172.17.48.9
+        mac: d4:be:d9:fb:50:78
+      eth0:
+        ip6: fe80::a236:9fff:fe08:f848
+        switch_port: TenGigabitEthernet 0/9
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_diff.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..150f0210245bfc8716cf0cc68615a2b5a1221572
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_diff.yaml
@@ -0,0 +1,103 @@
+---
+nodes:
+  graoully-[-]:
+    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: 20971520
+      clock_speed: 3200000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
+      vendor: Intel
+      version: E5-2630 v3
+
+  graoully-1:
+    chassis:
+      serial: 3DYYH82
+    storage_devices:
+      sda:
+        timeread: 1307
+        timewrite: 2926
+  graoully-10:
+    chassis:
+      serial: 3Z93J82
+    storage_devices:
+      sda:
+        timeread: 1257
+        timewrite: 2891
+  graoully-11:
+    chassis:
+      serial: 3ZBZH82
+    storage_devices:
+      sda:
+        timeread: 1265
+        timewrite: 2967
+  graoully-12:
+    chassis:
+      serial: 3DW1J82
+    storage_devices:
+      sda:
+        timeread: 1269
+        timewrite: 2906
+  graoully-13:
+    chassis:
+      serial: 3DV0J82
+    storage_devices:
+      sda:
+        timeread: 1274
+        timewrite: 2902
+  graoully-15:
+    chassis:
+      serial: 3DX1J82
+    storage_devices:
+      sda:
+        timeread: 1269
+        timewrite: 2889
+  graoully-16:
+    chassis:
+      serial: 3F4ZH82
+    storage_devices:
+      sda:
+        timeread: 1291
+        timewrite: 2935
+  graoully-2:
+    chassis:
+      serial: 3DY1J82
+    storage_devices:
+      sda:
+        timeread: 1298
+        timewrite: 2960
+  graoully-3:
+    chassis:
+      serial: 3F03J82
+    storage_devices:
+      sda:
+        timeread: 1282
+        timewrite: 2916
+  graoully-4:
+    chassis:
+      serial: 3DZ3J82
+    storage_devices:
+      sda:
+        timeread: 1267
+        timewrite: 2933
+  graoully-5:
+    chassis:
+      serial: 3ZD3J82
+    storage_devices:
+      sda:
+        timeread: 1282
+        timewrite: 2919
+  graoully-6:
+    chassis:
+      serial: 3ZG1J82
+    storage_devices:
+      sda:
+        timeread: 1281
+        timewrite: 2951
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
index 6aadbd368d637173b5b78a29d308e0699851f12f..cc15b98cd1b937edf2beddf0390b68d37908e9cd 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-1:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3DYYH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1307
-      timewrite: 2926
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3DYYH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:0c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.1
-      driver: ixgbe
       mac: 24:6e:96:03:0d:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:0d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0d:0a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:c0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:c2
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:0c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:0d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:41
+      interface: InfiniBand
+      ip: 172.18.70.1
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
index 4f2948d6d31b40a238290d5d484bc5651c7ce71d..14b5c6221b91236dbd5d818e4bc211fb9b516076 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-10:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3Z93J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1257
-      timewrite: 2891
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3Z93J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:fc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.10
-      driver: ixgbe
       mac: 24:6e:96:03:0d:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:fd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0d:fa
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:ac
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:ae
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:fc
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:fd
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:a1
+      interface: InfiniBand
+      ip: 172.18.70.10
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
index 40d6c4c26dbc297e4bc2c020c13c6915546b3195..70e1666f8cc4b7cdfed1db5e982aa5777557d62f 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-11:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3ZBZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1265
-      timewrite: 2967
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3ZBZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.11
-      driver: ixgbe
       mac: 24:6e:96:03:1f:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:9c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:9d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:1f:9a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:39:64
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:39:66
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:1f:9c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:1f:9d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:51
+      interface: InfiniBand
+      ip: 172.18.70.11
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
index 9bfaed234c5523b7fdf3a95f2a238212fa1a1cf8..e49eca299d46cc1c85a1993ea889c4cb1d6c4178 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-12:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3DW1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1269
-      timewrite: 2906
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3DW1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:9c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.12
-      driver: ixgbe
       mac: 24:6e:96:03:09:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:9d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:09:9a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:30
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:32
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:9c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:9d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:71
+      interface: InfiniBand
+      ip: 172.18.70.12
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
index 4854ef8aef89815270a6945a3541b37139999ba2..82a56a4fd22e680166622fbae86c4c50cab1ada5 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-13:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3DV0J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1274
-      timewrite: 2902
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3DV0J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.13
-      driver: ixgbe
       mac: 24:6e:96:03:24:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:0c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:0d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:24:0a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:00
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:02
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:24:0c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:24:0d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:51:c1
+      interface: InfiniBand
+      ip: 172.18.70.13
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
index 0d61c9bee7f8e3d8aaab95eb12c86e87ee70ebd7..1ee79315f388ae19f0b8144b21c5b1330bd20b0e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-15:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3DX1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1269
-      timewrite: 2889
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3DX1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:fc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.15
-      driver: ixgbe
       mac: 24:6e:96:03:09:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:fd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:09:fa
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:d8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:da
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:fc
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:fd
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:71
+      interface: InfiniBand
+      ip: 172.18.70.15
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
index ea7d2e1118e51d3725abc4304605825413e46c9f..b02d9732bb3dca4912c13694f541d8b2a7d56b03 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-16:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3F4ZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1291
-      timewrite: 2935
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3F4ZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:54
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.16
-      driver: ixgbe
       mac: 24:6e:96:03:0f:50
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:55
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0f:52
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:d4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:d6
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:54
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:55
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:81
+      interface: InfiniBand
+      ip: 172.18.70.16
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
index bab984fc1ce6052063658ace7d2b343a4e439925..870876b48356b32c1a63bc1529a8b73fd3b24758 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-2:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3DY1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1298
-      timewrite: 2960
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3DY1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:2c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.2
-      driver: ixgbe
       mac: 24:6e:96:03:0a:28
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:2d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0a:2a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:f0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:f2
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:2c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:2d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:61
+      interface: InfiniBand
+      ip: 172.18.70.2
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
index c46139d9991da0f9d2a68767785fa21207c9bee8..2ba1721d2ffc3758dc70cb3103aab18769c02def 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-3:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3F03J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1282
-      timewrite: 2916
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3F03J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:0c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.3
-      driver: ixgbe
       mac: 24:6e:96:03:11:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:0d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:0a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:d4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:d6
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:0c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:0d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:61
+      interface: InfiniBand
+      ip: 172.18.70.3
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
index b0c6dcb423c7ec99b9224ec0bdf0145e44eaca5d..f12e52a2b4a0ae62bdb3d6de3c687caa64b33577 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-4:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3DZ3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1267
-      timewrite: 2933
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3DZ3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:5c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.4
-      driver: ixgbe
       mac: 24:6e:96:03:0e:58
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:5d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0e:5a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:ec
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:ee
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:5c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:5d
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:4f:b1
+      interface: InfiniBand
+      ip: 172.18.70.4
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
index 4dcd084d969ccf9cacb6b0ac0e2c1145f2644d5a..35756fea2b4c21b8360107e5ed95d26a35675ee3 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-5:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3ZD3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1282
-      timewrite: 2919
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3ZD3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:94
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.5
-      driver: ixgbe
       mac: 24:6e:96:03:1f:90
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:95
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:1f:92
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:b4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:b6
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:1f:94
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:1f:95
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:c1
+      interface: InfiniBand
+      ip: 172.18.70.5
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
index 2564aaa2fb3610ebb6ed4f604fdafc83b20de68c..39140301681d20461b0904e312dce363cfc7aad4 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -1,92 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graoully-6:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3ZG1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1281
-      timewrite: 2951
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3ZG1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:24
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.70.6
-      driver: ixgbe
       mac: 24:6e:96:03:0c:20
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:25
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0c:22
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:9c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:9e
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:24
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:25
       management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:2e:01
+      interface: InfiniBand
+      ip: 172.18.70.6
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphene/graphene_diff.yaml b/input/grid5000/sites/nancy/clusters/graphene/graphene_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c1ca24891fb0d98fa053a41c41e1522eb1db54cc
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/graphene/graphene_diff.yaml
@@ -0,0 +1,1333 @@
+---
+nodes:
+  graphene-[1-144]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        mountable: false
+      ib0:
+        enabled: true
+        mountable: true
+      ib1:
+        enabled: false
+        mountable: 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: 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:
+        vendor: Hitachi
+
+  graphene-1:
+    chassis:
+      serial: 1009390003
+    network_adapters:
+      bmc:
+        ip: 172.17.64.1
+        mac: 00:e0:81:d5:06:83
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:680
+  graphene-10:
+    chassis:
+      serial: 1009390012
+    network_adapters:
+      bmc:
+        ip: 172.17.64.10
+        mac: 00:e0:81:d5:06:d3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6d0
+  graphene-100:
+    chassis:
+      serial: 1009390102
+    network_adapters:
+      bmc:
+        ip: 172.17.64.100
+        mac: 00:e0:81:d5:07:cf
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7cc
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d
+        ip: 172.18.64.100
+        ip6: fe80::202:c903:b:5d0d
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0e
+  graphene-101:
+    chassis:
+      serial: 1009390103
+    network_adapters:
+      bmc:
+        ip: 172.17.64.101
+        mac: 00:e0:81:d5:06:a3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6a0
+  graphene-102:
+    chassis:
+      serial: 1009390104
+    network_adapters:
+      bmc:
+        ip: 172.17.64.102
+        mac: 00:e0:81:d5:08:bf
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8bc
+  graphene-103:
+    chassis:
+      serial: 1009390105
+    network_adapters:
+      bmc:
+        ip: 172.17.64.103
+        mac: 00:e0:81:d5:08:cb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8c8
+  graphene-104:
+    chassis:
+      serial: 1009390106
+    network_adapters:
+      bmc:
+        ip: 172.17.64.104
+        mac: 00:e0:81:d5:07:67
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:764
+  graphene-105:
+    chassis:
+      serial: 1009390107
+    network_adapters:
+      bmc:
+        ip: 172.17.64.105
+        mac: 00:e0:81:d5:06:bf
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6bc
+  graphene-106:
+    chassis:
+      serial: 1009390108
+    network_adapters:
+      bmc:
+        ip: 172.17.64.106
+        mac: 00:e0:81:d5:07:f7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7f4
+  graphene-107:
+    chassis:
+      serial: 1009390109
+    network_adapters:
+      bmc:
+        ip: 172.17.64.107
+        mac: 00:e0:81:d5:07:cb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7c8
+  graphene-108:
+    chassis:
+      serial: 1009390110
+    network_adapters:
+      bmc:
+        ip: 172.17.64.108
+        mac: 00:e0:81:d5:07:17
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:714
+  graphene-109:
+    chassis:
+      serial: 1009390111
+    network_adapters:
+      bmc:
+        ip: 172.17.64.109
+        mac: 00:e0:81:d5:08:33
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:830
+  graphene-11:
+    chassis:
+      serial: 1009390013
+    network_adapters:
+      bmc:
+        ip: 172.17.64.11
+        mac: 00:e0:81:d5:08:7f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:87c
+  graphene-110:
+    chassis:
+      serial: 1009390112
+    network_adapters:
+      bmc:
+        ip: 172.17.64.110
+        mac: 00:e0:81:d5:07:6f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:76c
+  graphene-111:
+    chassis:
+      serial: 1009390113b
+    network_adapters:
+      bmc:
+        ip: 172.17.64.111
+        mac: 00:e0:81:d5:08:5b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:858
+  graphene-112:
+    chassis:
+      serial: 1009390114
+    network_adapters:
+      bmc:
+        ip: 172.17.64.112
+        mac: 00:e0:81:d5:08:13
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:810
+  graphene-113:
+    chassis:
+      serial: 1009390115
+    network_adapters:
+      bmc:
+        ip: 172.17.64.113
+        mac: 00:e0:81:d5:07:bf
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7bc
+  graphene-114:
+    chassis:
+      serial: 1009390116
+    network_adapters:
+      bmc:
+        ip: 172.17.64.114
+        mac: 00:e0:81:d5:06:b3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6b0
+  graphene-115:
+    chassis:
+      serial: 1009390117
+    network_adapters:
+      bmc:
+        ip: 172.17.64.115
+        mac: 00:e0:81:d5:08:07
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:804
+  graphene-116:
+    chassis:
+      serial: 1009390118
+    network_adapters:
+      bmc:
+        ip: 172.17.64.116
+        mac: 00:e0:81:d5:08:2b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:828
+  graphene-117:
+    chassis:
+      serial: 1009390119
+    network_adapters:
+      bmc:
+        ip: 172.17.64.117
+        mac: 00:e0:81:d5:06:e7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6e4
+  graphene-118:
+    chassis:
+      serial: 1009390120
+    network_adapters:
+      bmc:
+        ip: 172.17.64.118
+        mac: 00:e0:81:d5:07:bb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7b8
+  graphene-119:
+    chassis:
+      serial: 1009390121
+    network_adapters:
+      bmc:
+        ip: 172.17.64.119
+        mac: 00:e0:81:d5:06:f3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6f0
+  graphene-12:
+    chassis:
+      serial: 1009390014
+    network_adapters:
+      bmc:
+        ip: 172.17.64.12
+        mac: 00:e0:81:d5:07:8f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:78c
+  graphene-120:
+    chassis:
+      serial: 1009390122
+    network_adapters:
+      bmc:
+        ip: 172.17.64.120
+        mac: 00:e0:81:d5:08:af
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8ac
+  graphene-121:
+    chassis:
+      serial: 1009390123
+    network_adapters:
+      bmc:
+        ip: 172.17.64.121
+        mac: 00:e0:81:d5:07:3b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:738
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d
+        ip: 172.18.64.121
+        ip6: fe80::202:c903:b:932d
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2e
+  graphene-122:
+    chassis:
+      serial: 1009390124
+    network_adapters:
+      bmc:
+        ip: 172.17.64.122
+        mac: 00:e0:81:d5:08:3b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:838
+  graphene-124:
+    chassis:
+      serial: 1009390126
+    network_adapters:
+      bmc:
+        ip: 172.17.64.124
+        mac: 00:e0:81:d5:06:a7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6a4
+  graphene-125:
+    chassis:
+      serial: 1009390127
+    network_adapters:
+      bmc:
+        ip: 172.17.64.125
+        mac: 00:e0:81:d5:08:6b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:868
+  graphene-126:
+    chassis:
+      serial: 1009390128
+    network_adapters:
+      bmc:
+        ip: 172.17.64.126
+        mac: 00:e0:81:d5:08:d3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8d0
+  graphene-127:
+    chassis:
+      serial: 1009390129
+    network_adapters:
+      bmc:
+        ip: 172.17.64.127
+        mac: 00:e0:81:d5:08:43
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:840
+  graphene-128:
+    chassis:
+      serial: 1009390130
+    network_adapters:
+      bmc:
+        ip: 172.17.64.128
+        mac: 00:e0:81:d5:08:e7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8e4
+  graphene-129:
+    chassis:
+      serial: 1009390131
+    network_adapters:
+      bmc:
+        ip: 172.17.64.129
+        mac: 00:e0:81:d5:07:1f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:71c
+  graphene-13:
+    chassis:
+      serial: 1009390015
+    network_adapters:
+      bmc:
+        ip: 172.17.64.13
+        mac: 00:e0:81:d5:06:ff
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6fc
+  graphene-130:
+    chassis:
+      serial: 1009390132b
+    network_adapters:
+      bmc:
+        ip: 172.17.64.130
+        mac: 00:e0:81:d2:5a:37
+      eth0:
+        ip6: fe80::2e0:81ff:fed2:5a34
+  graphene-131:
+    chassis:
+      serial: 1009390133b
+    network_adapters:
+      bmc:
+        ip: 172.17.64.131
+        mac: 00:e0:81:d5:06:fb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6f8
+  graphene-132:
+    chassis:
+      serial: 1009390134
+    network_adapters:
+      bmc:
+        ip: 172.17.64.132
+        mac: 00:e0:81:d5:08:8f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:88c
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d
+        ip: 172.18.64.132
+        ip6: fe80::202:c903:b:920d
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0e
+  graphene-133:
+    chassis:
+      serial: 1009390135
+    network_adapters:
+      bmc:
+        ip: 172.17.64.133
+        mac: 00:e0:81:d5:07:e3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7e0
+  graphene-134:
+    chassis:
+      serial: 1009390136
+    network_adapters:
+      bmc:
+        ip: 172.17.64.134
+        mac: 00:e0:81:d5:08:eb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8e8
+  graphene-135:
+    chassis:
+      serial: 1009390137
+    network_adapters:
+      bmc:
+        ip: 172.17.64.135
+        mac: 00:e0:81:d5:06:73
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:670
+  graphene-136:
+    chassis:
+      serial: 1009390138
+    network_adapters:
+      bmc:
+        ip: 172.17.64.136
+        mac: 00:e0:81:d5:07:7f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:77c
+  graphene-137:
+    chassis:
+      serial: 1009390139
+    network_adapters:
+      bmc:
+        ip: 172.17.64.137
+        mac: 00:e0:81:d5:08:47
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:844
+  graphene-138:
+    chassis:
+      serial: 1009390140b
+    network_adapters:
+      bmc:
+        ip: 172.17.64.138
+        mac: 00:e0:81:d5:08:c7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8c4
+  graphene-139:
+    chassis:
+      serial: 1009390141
+    network_adapters:
+      bmc:
+        ip: 172.17.64.139
+        mac: 00:e0:81:d5:07:83
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:780
+  graphene-14:
+    chassis:
+      serial: 1009390016
+    network_adapters:
+      bmc:
+        ip: 172.17.64.14
+        mac: 00:e0:81:d5:06:d7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6d4
+  graphene-140:
+    chassis:
+      serial: 1009390142
+    network_adapters:
+      bmc:
+        ip: 172.17.64.140
+        mac: 00:e0:81:d5:07:7b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:778
+  graphene-141:
+    chassis:
+      serial: 1009390143
+    network_adapters:
+      bmc:
+        ip: 172.17.64.141
+        mac: 00:e0:81:d5:08:77
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:874
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:93
+        ip: 172.18.64.141
+        ip6: fe80::202:c903:5:f793
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:94
+  graphene-142:
+    chassis:
+      serial: 1009390144
+    network_adapters:
+      bmc:
+        ip: 172.17.64.142
+        mac: 00:e0:81:d5:06:8f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:68c
+  graphene-143:
+    chassis:
+      serial: 1009390145
+    network_adapters:
+      bmc:
+        ip: 172.17.64.143
+        mac: 00:e0:81:d5:07:97
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:794
+  graphene-15:
+    chassis:
+      serial: 1009390017
+    network_adapters:
+      bmc:
+        ip: 172.17.64.15
+        mac: 00:e0:81:d5:07:eb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7e8
+  graphene-16:
+    chassis:
+      serial: 1009390018
+    network_adapters:
+      bmc:
+        ip: 172.17.64.16
+        mac: 00:e0:81:d5:07:c3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7c0
+  graphene-17:
+    chassis:
+      serial: 1009390019
+    network_adapters:
+      bmc:
+        ip: 172.17.64.17
+        mac: 00:e0:81:d5:08:ab
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8a8
+  graphene-18:
+    chassis:
+      serial: 1009390020
+    network_adapters:
+      bmc:
+        ip: 172.17.64.18
+        mac: 00:e0:81:d5:08:3f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:83c
+  graphene-19:
+    chassis:
+      serial: 1009390021
+    network_adapters:
+      bmc:
+        ip: 172.17.64.19
+        mac: 00:e0:81:d5:08:b7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8b4
+  graphene-2:
+    chassis:
+      serial: 1009390004
+    network_adapters:
+      bmc:
+        ip: 172.17.64.2
+        mac: 00:e0:81:d5:07:73
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:770
+  graphene-20:
+    chassis:
+      serial: 1009390022
+    network_adapters:
+      bmc:
+        ip: 172.17.64.20
+        mac: 00:e0:81:d5:07:6b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:768
+  graphene-21:
+    chassis:
+      serial: 1009390023b
+    network_adapters:
+      bmc:
+        ip: 172.17.64.21
+        mac: 00:e0:81:d2:59:fb
+      eth0:
+        ip6: fe80::2e0:81ff:fed2:59f8
+  graphene-22:
+    chassis:
+      serial: 1009390024
+    network_adapters:
+      bmc:
+        ip: 172.17.64.22
+        mac: 00:e0:81:d5:07:db
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7d8
+  graphene-23:
+    chassis:
+      serial: 1009390025
+    network_adapters:
+      bmc:
+        ip: 172.17.64.23
+        mac: 00:e0:81:d5:06:c7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6c4
+  graphene-25:
+    chassis:
+      serial: 1009390027
+    network_adapters:
+      bmc:
+        ip: 172.17.64.25
+        mac: 00:e0:81:d5:07:53
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:750
+  graphene-26:
+    chassis:
+      serial: 1009390028
+    network_adapters:
+      bmc:
+        ip: 172.17.64.26
+        mac: 00:e0:81:d5:08:6f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:86c
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9d
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9e
+        management: false
+        mountable: false
+        mounted: false
+        rate: 10000000000
+        version: MT26418
+  graphene-27:
+    chassis:
+      serial: 1009390029
+    network_adapters:
+      bmc:
+        ip: 172.17.64.27
+        mac: 00:e0:81:d5:07:5f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:75c
+  graphene-29:
+    chassis:
+      serial: 1009390031
+    network_adapters:
+      bmc:
+        ip: 172.17.64.29
+        mac: 00:e0:81:d5:06:57
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:654
+  graphene-30:
+    chassis:
+      serial: 1009390032
+    network_adapters:
+      bmc:
+        ip: 172.17.64.30
+        mac: 00:e0:81:d5:08:ef
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8ec
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79
+        ip: 172.18.64.30
+        ip6: fe80::202:c903:b:9279
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7a
+  graphene-31:
+    chassis:
+      serial: 1009390033
+    network_adapters:
+      bmc:
+        ip: 172.17.64.31
+        mac: 00:e0:81:d5:06:63
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:660
+  graphene-32:
+    chassis:
+      serial: 1009390034
+    network_adapters:
+      bmc:
+        ip: 172.17.64.32
+        mac: 00:e0:81:d5:06:cb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6c8
+  graphene-33:
+    chassis:
+      serial: 1009390035
+    network_adapters:
+      bmc:
+        ip: 172.17.64.33
+        mac: 00:e0:81:d5:06:6f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:66c
+  graphene-34:
+    chassis:
+      serial: 1009390036
+    network_adapters:
+      bmc:
+        ip: 172.17.64.34
+        mac: 00:e0:81:d5:08:9f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:89c
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65
+        ip: 172.18.64.34
+        ip6: fe80::202:c903:b:9165
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:66
+  graphene-35:
+    chassis:
+      serial: 1009390037
+    network_adapters:
+      bmc:
+        ip: 172.17.64.35
+        mac: 00:e0:81:d5:08:1f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:81c
+  graphene-36:
+    chassis:
+      serial: 1009390038
+    network_adapters:
+      bmc:
+        ip: 172.17.64.36
+        mac: 00:e0:81:d5:06:4b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:648
+  graphene-37:
+    chassis:
+      serial: 1009390039
+    network_adapters:
+      bmc:
+        ip: 172.17.64.37
+        mac: 00:e0:81:d5:08:a7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8a4
+  graphene-38:
+    chassis:
+      serial: 1009390040
+    network_adapters:
+      bmc:
+        ip: 172.17.64.38
+        mac: 00:e0:81:d5:07:33
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:730
+  graphene-4:
+    chassis:
+      serial: 1009390096b
+    network_adapters:
+      bmc:
+        ip: 172.17.64.4
+        mac: 00:e0:81:d5:08:57
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:854
+  graphene-40:
+    chassis:
+      serial: 1009390042
+    network_adapters:
+      bmc:
+        ip: 172.17.64.40
+        mac: 00:e0:81:d5:06:f7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6f4
+  graphene-41:
+    chassis:
+      serial: 1009390043
+    network_adapters:
+      bmc:
+        ip: 172.17.64.41
+        mac: 00:e0:81:d5:07:af
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7ac
+  graphene-42:
+    chassis:
+      serial: 1009390044
+    network_adapters:
+      bmc:
+        ip: 172.17.64.42
+        mac: 00:e0:81:d5:07:8b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:788
+  graphene-43:
+    chassis:
+      serial: 1009390045
+    network_adapters:
+      bmc:
+        ip: 172.17.64.43
+        mac: 00:e0:81:d5:08:27
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:824
+  graphene-44:
+    chassis:
+      serial: 1009390046
+    network_adapters:
+      bmc:
+        ip: 172.17.64.44
+        mac: 00:e0:81:d5:06:e3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6e0
+  graphene-46:
+    chassis:
+      serial: 1009390048
+    network_adapters:
+      bmc:
+        ip: 172.17.64.46
+        mac: 00:e0:81:d5:06:97
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:694
+  graphene-47:
+    chassis:
+      serial: 1009390049
+    network_adapters:
+      bmc:
+        ip: 172.17.64.47
+        mac: 00:e0:81:d5:08:97
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:894
+  graphene-48:
+    chassis:
+      serial: 1009390050
+    network_adapters:
+      bmc:
+        ip: 172.17.64.48
+        mac: 00:e0:81:d5:06:eb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6e8
+  graphene-49:
+    chassis:
+      serial: 1009390051
+    network_adapters:
+      bmc:
+        ip: 172.17.64.49
+        mac: 00:e0:81:d5:08:5f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:85c
+  graphene-5:
+    chassis:
+      serial: 1009390007
+    network_adapters:
+      bmc:
+        ip: 172.17.64.5
+        mac: 00:e0:81:d5:08:bb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8b8
+  graphene-50:
+    chassis:
+      serial: 1009390052
+    network_adapters:
+      bmc:
+        ip: 172.17.64.50
+        mac: 00:e0:81:d5:06:77
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:674
+  graphene-51:
+    chassis:
+      serial: 1009390053
+    network_adapters:
+      bmc:
+        ip: 172.17.64.51
+        mac: 00:e0:81:d5:07:63
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:760
+  graphene-53:
+    chassis:
+      serial: 1009390055
+    network_adapters:
+      bmc:
+        ip: 172.17.64.53
+        mac: 00:e0:81:d5:07:fb
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7f8
+  graphene-54:
+    chassis:
+      serial: 1009390056
+    network_adapters:
+      bmc:
+        ip: 172.17.64.54
+        mac: 00:e0:81:d5:07:ab
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7a8
+  graphene-55:
+    chassis:
+      serial: 1009390057
+    network_adapters:
+      bmc:
+        ip: 172.17.64.55
+        mac: 00:e0:81:d5:08:93
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:890
+  graphene-56:
+    chassis:
+      serial: 1009390058
+    network_adapters:
+      bmc:
+        ip: 172.17.64.56
+        mac: 00:e0:81:d5:06:7b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:678
+  graphene-57:
+    chassis:
+      serial: 1009390059
+    network_adapters:
+      bmc:
+        ip: 172.17.64.57
+        mac: 00:e0:81:d5:08:a3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8a0
+  graphene-58:
+    chassis:
+      serial: 1009390060
+    network_adapters:
+      bmc:
+        ip: 172.17.64.58
+        mac: 00:e0:81:d5:07:37
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:734
+  graphene-59:
+    chassis:
+      serial: 1009390061
+    network_adapters:
+      bmc:
+        ip: 172.17.64.59
+        mac: 00:e0:81:d5:07:2f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:72c
+  graphene-6:
+    chassis:
+      serial: 1009390008
+    network_adapters:
+      bmc:
+        ip: 172.17.64.6
+        mac: 00:e0:81:d5:06:ef
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6ec
+  graphene-60:
+    chassis:
+      serial: 1009390062
+    network_adapters:
+      bmc:
+        ip: 172.17.64.60
+        mac: 00:e0:81:d5:08:4f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:84c
+  graphene-61:
+    chassis:
+      serial: 1009390063
+    network_adapters:
+      bmc:
+        ip: 172.17.64.61
+        mac: 00:e0:81:d5:07:03
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:700
+  graphene-62:
+    chassis:
+      serial: 1009390064
+    network_adapters:
+      bmc:
+        ip: 172.17.64.62
+        mac: 00:e0:81:d5:07:c7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7c4
+  graphene-63:
+    chassis:
+      serial: 1009390065
+    network_adapters:
+      bmc:
+        ip: 172.17.64.63
+        mac: 00:e0:81:d5:06:6b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:668
+  graphene-64:
+    chassis:
+      serial: 1009390066
+    network_adapters:
+      bmc:
+        ip: 172.17.64.64
+        mac: 00:e0:81:d5:08:8b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:888
+  graphene-65:
+    chassis:
+      serial: 1009390067
+    network_adapters:
+      bmc:
+        ip: 172.17.64.65
+        mac: 00:e0:81:d5:07:47
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:744
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9
+        ip: 172.18.64.65
+        ip6: fe80::202:c903:b:93d9
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:da
+  graphene-66:
+    chassis:
+      serial: 1009390068
+    network_adapters:
+      bmc:
+        ip: 172.17.64.66
+        mac: 00:e0:81:d5:08:17
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:814
+  graphene-67:
+    chassis:
+      serial: 1009390069
+    network_adapters:
+      bmc:
+        ip: 172.17.64.67
+        mac: 00:e0:81:d5:07:b3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7b0
+  graphene-68:
+    chassis:
+      serial: 1009390070
+    network_adapters:
+      bmc:
+        ip: 172.17.64.68
+        mac: 00:e0:81:d5:06:53
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:650
+  graphene-69:
+    chassis:
+      serial: 1009390071
+    network_adapters:
+      bmc:
+        ip: 172.17.64.69
+        mac: 00:e0:81:d5:06:9b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:698
+  graphene-7:
+    chassis:
+      serial: 1009390009
+    network_adapters:
+      bmc:
+        ip: 172.17.64.7
+        mac: 00:e0:81:d5:07:3f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:73c
+  graphene-70:
+    chassis:
+      serial: 1009390072
+    network_adapters:
+      bmc:
+        ip: 172.17.64.70
+        mac: 00:e0:81:d5:07:4f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:74c
+  graphene-71:
+    chassis:
+      serial: 1009390073
+    network_adapters:
+      bmc:
+        ip: 172.17.64.71
+        mac: 00:e0:81:d5:07:2b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:728
+  graphene-72:
+    chassis:
+      serial: 1009390074
+    network_adapters:
+      bmc:
+        ip: 172.17.64.72
+        mac: 00:e0:81:d5:07:e7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7e4
+  graphene-73:
+    chassis:
+      serial: 1009390075
+    network_adapters:
+      bmc:
+        ip: 172.17.64.73
+        mac: 00:e0:81:d5:07:43
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:740
+  graphene-74:
+    chassis:
+      serial: 1009390076
+    network_adapters:
+      bmc:
+        ip: 172.17.64.74
+        mac: 00:e0:81:d5:08:83
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:880
+  graphene-75:
+    chassis:
+      serial: 1009390077
+    network_adapters:
+      bmc:
+        ip: 172.17.64.75
+        mac: 00:e0:81:d5:07:07
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:704
+  graphene-76:
+    chassis:
+      serial: 1009390078
+    network_adapters:
+      bmc:
+        ip: 172.17.64.76
+        mac: 00:e0:81:d5:07:23
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:720
+  graphene-77:
+    chassis:
+      serial: 1009390079
+    network_adapters:
+      bmc:
+        ip: 172.17.64.77
+        mac: 00:e0:81:d5:07:a3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7a0
+  graphene-78:
+    chassis:
+      serial: 1009390080
+    network_adapters:
+      bmc:
+        ip: 172.17.64.78
+        mac: 00:e0:81:d5:08:53
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:850
+  graphene-79:
+    chassis:
+      serial: 1009390081
+    network_adapters:
+      bmc:
+        ip: 172.17.64.79
+        mac: 00:e0:81:d5:08:7b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:878
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5
+        ip: 172.18.64.79
+        ip6: fe80::202:c903:b:92f5
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f6
+  graphene-8:
+    chassis:
+      serial: 1009390010
+    network_adapters:
+      bmc:
+        ip: 172.17.64.8
+        mac: 00:e0:81:d5:08:0b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:808
+  graphene-80:
+    chassis:
+      serial: 1009390082
+    network_adapters:
+      bmc:
+        ip: 172.17.64.80
+        mac: 00:e0:81:d5:06:db
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6d8
+  graphene-81:
+    chassis:
+      serial: 1009390083
+    network_adapters:
+      bmc:
+        ip: 172.17.64.81
+        mac: 00:e0:81:d5:07:27
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:724
+  graphene-82:
+    chassis:
+      serial: 1009390084
+    network_adapters:
+      bmc:
+        ip: 172.17.64.82
+        mac: 00:e0:81:d5:07:b7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7b4
+  graphene-83:
+    chassis:
+      serial: 1009390085
+    network_adapters:
+      bmc:
+        ip: 172.17.64.83
+        mac: 00:e0:81:d5:06:93
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:690
+  graphene-84:
+    chassis:
+      serial: 1009390086
+    network_adapters:
+      bmc:
+        ip: 172.17.64.84
+        mac: 00:e0:81:d5:07:1b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:718
+  graphene-85:
+    chassis:
+      serial: 1009390087
+    network_adapters:
+      bmc:
+        ip: 172.17.64.85
+        mac: 00:e0:81:d5:07:ef
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7ec
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99
+        ip: 172.18.64.85
+        ip6: fe80::202:c903:b:9399
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9a
+  graphene-86:
+    chassis:
+      serial: 1009390088
+    network_adapters:
+      bmc:
+        ip: 172.17.64.86
+        mac: 00:e0:81:d5:08:0f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:80c
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1
+        ip: 172.18.64.86
+        ip6: fe80::202:c903:b:93a1
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a2
+  graphene-87:
+    chassis:
+      serial: 1009390089
+    network_adapters:
+      bmc:
+        ip: 172.17.64.87
+        mac: 00:e0:81:d5:07:5b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:758
+  graphene-88:
+    chassis:
+      serial: 1009390090
+    network_adapters:
+      bmc:
+        ip: 172.17.64.88
+        mac: 00:e0:81:d5:08:63
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:860
+  graphene-89:
+    chassis:
+      serial: 1009390091
+    network_adapters:
+      bmc:
+        ip: 172.17.64.89
+        mac: 00:e0:81:d5:08:9b
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:898
+  graphene-9:
+    chassis:
+      serial: 1009390011
+    network_adapters:
+      bmc:
+        ip: 172.17.64.9
+        mac: 00:e0:81:d5:08:87
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:884
+  graphene-90:
+    chassis:
+      serial: 1009390092
+    network_adapters:
+      bmc:
+        ip: 172.17.64.90
+        mac: 00:e0:81:d5:06:67
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:664
+  graphene-91:
+    chassis:
+      serial: 1009390093
+    network_adapters:
+      bmc:
+        ip: 172.17.64.91
+        mac: 00:e0:81:d5:06:df
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6dc
+  graphene-92:
+    chassis:
+      serial: 1009390094
+    network_adapters:
+      bmc:
+        ip: 172.17.64.92
+        mac: 00:e0:81:d5:07:a7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:7a4
+  graphene-93:
+    chassis:
+      serial: 1009390095
+    network_adapters:
+      bmc:
+        ip: 172.17.64.93
+        mac: 00:e0:81:d5:06:4f
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:64c
+  graphene-95:
+    chassis:
+      serial: 1009390097
+    network_adapters:
+      bmc:
+        ip: 172.17.64.95
+        mac: 00:e0:81:d5:06:c3
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:6c0
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95
+        ip: 172.18.64.95
+        ip6: fe80::202:c903:b:5e95
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:96
+  graphene-97:
+    chassis:
+      serial: 1009390099
+    network_adapters:
+      bmc:
+        ip: 172.17.64.97
+        mac: 00:e0:81:d5:08:03
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:800
+  graphene-99:
+    chassis:
+      serial: 1009390101
+    network_adapters:
+      bmc:
+        ip: 172.17.64.99
+        mac: 00:e0:81:d5:08:d7
+      eth0:
+        ip6: fe80::2e0:81ff:fed5:8d4
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1
+        ip: 172.18.64.99
+        ip6: fe80::202:c903:b:5eb1
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b2
+  graphene-[26-]:
+    ib0:
+      driver: mlx4_core
+      interface: InfiniBand
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
+      enabled: false
+      interface: InfiniBand
+      management: false
+      mountable: false
+      mounted: false
+      rate: 10000000000
+      version: MT26418
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
index 74b3824daac6e77d91cf725dc8e6c0cc18ec975f..f23a8015486c035ce6fdf293e83e76c34b6a6f7b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-1:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.1
+      mac: 00:e0:81:d5:06:80
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:81
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:82
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.1
       ip6: fe80::202:c903:b:9281
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.1
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:82
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:80
-      ip6: fe80::2e0:81ff:fed5:680
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.1
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:83
-      ip: 172.17.64.1
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390003
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
index 8201801d3fa0c568055ccaaa74da3ac6fee7d01a..07de38ff5d5fe999d27f8e5b3f226c64d77565e8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-10:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.10
+      mac: 00:e0:81:d5:06:d0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:d1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:d2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.10
       ip6: fe80::202:c903:b:916d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.10
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:d0
-      ip6: fe80::2e0:81ff:fed5:6d0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.10
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:d2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:d3
-      ip: 172.17.64.10
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390012
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
index 19bd0f9da2cd7662fa09005aa5a609fb1e4560dc..c83aa3336d8549e5e7968a2e1e4c7691b2c99c9b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-100:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  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:5d:0d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5d0d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.100
-      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:5d:0e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:cc
-      ip6: fe80::2e0:81ff:fed5:7cc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.100
+      mac: 00:e0:81:d5:07:cc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:cd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:ce
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:cf
-      ip: 172.17.64.100
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390102
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
index ff8e07644b7acce25f7be5a19cf707c7837006d3..c8aa677ea101b38f423f80f8c805d88e70b20be5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-101:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.101
+      mac: 00:e0:81:d5:06:a0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:a1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:a2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.101
       ip6: fe80::202:c903:b:5cd9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.101
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:da
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:a0
-      ip6: fe80::2e0:81ff:fed5:6a0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.101
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:a3
-      ip: 172.17.64.101
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390103
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
index c7c4acc0dd5dd3f15d926c54f260e0466f13a9e4..303d329a068679a52a86af605cbd5489b1c2fc89 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-102:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.102
+      mac: 00:e0:81:d5:08:bc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:bd
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:be
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:71
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.102
       ip6: fe80::202:c903:b:5e71
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.102
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:72
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:bc
-      ip6: fe80::2e0:81ff:fed5:8bc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.102
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:bf
-      ip: 172.17.64.102
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390104
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
index 03da9c2449b6b8d54bd08851f646bfbfd13fe45c..76a2d3cf99e817367ba2f2b25c40c6313b21246c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-103:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.103
+      mac: 00:e0:81:d5:08:c8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:c9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:ca
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.103
       ip6: fe80::202:c903:b:5d49
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.103
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:4a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:c8
-      ip6: fe80::2e0:81ff:fed5:8c8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.103
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:cb
-      ip: 172.17.64.103
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390105
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
index 43235d0dc4769010b02531d435e48e0a57b7c216..f60c6c60f40b932e2325947221484d647e1177a6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-104:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.104
+      mac: 00:e0:81:d5:07:64
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:65
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:66
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.104
       ip6: fe80::202:c903:b:5d15
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.104
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:16
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:64
-      ip6: fe80::2e0:81ff:fed5:764
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.104
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:65
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:67
-      ip: 172.17.64.104
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390106
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
index d1351b3e26caf75da17d132239843c162785828e..d81ed31f7d84e7544a44019d68463dad8581ceff 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-105:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.105
+      mac: 00:e0:81:d5:06:bc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:bd
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:be
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.105
       ip6: fe80::202:c903:b:5d19
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.105
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:1a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:bc
-      ip6: fe80::2e0:81ff:fed5:6bc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.105
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:bf
-      ip: 172.17.64.105
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390107
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
index 29c5a981c71dcff031718677badb2c6b13b070c8..b84a71926fa81943aeca18c9d39def946ede0a45 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-106:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.106
+      mac: 00:e0:81:d5:07:f4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:f5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:f6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.106
       ip6: fe80::202:c903:b:5cad
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.106
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ae
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:f4
-      ip6: fe80::2e0:81ff:fed5:7f4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.106
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:f6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:f7
-      ip: 172.17.64.106
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390108
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
index d95633dd7a2dffa5ea308ce0200952a27b6d3762..bbc7a006cc9d3bf65ea7684944a0190286468390 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-107:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.107
+      mac: 00:e0:81:d5:07:c8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:c9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:ca
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.107
       ip6: fe80::202:c903:b:5d3d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.107
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:c8
-      ip6: fe80::2e0:81ff:fed5:7c8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.107
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:cb
-      ip: 172.17.64.107
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390109
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
index bc1ef0bad3dfaa13680ccd09833e2b7538af1c53..e715459cd79509ae8e4b50ceacd92a8e88c38499 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-108:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.108
+      mac: 00:e0:81:d5:07:14
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:15
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:16
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.108
       ip6: fe80::202:c903:b:5d21
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.108
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:22
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:14
-      ip6: fe80::2e0:81ff:fed5:714
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.108
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:17
-      ip: 172.17.64.108
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390110
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
index 580065337faf578c5d1be89a46527feaaf14bd93..2362da4f2178915277764e53930736987d207847 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-109:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.109
+      mac: 00:e0:81:d5:08:30
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:31
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:32
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.109
       ip6: fe80::202:c903:b:5d25
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.109
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:26
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:30
-      ip6: fe80::2e0:81ff:fed5:830
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.109
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:33
-      ip: 172.17.64.109
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390111
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
index dc7804c100b818bd41501b8d147f767d68ec9394..7309c9e18a9fcaad9660c8337ec3745515185c9b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-11:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.11
+      mac: 00:e0:81:d5:08:7c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:7d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:7e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.11
       ip6: fe80::202:c903:b:9171
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.11
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:72
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:7c
-      ip6: fe80::2e0:81ff:fed5:87c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.11
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:7e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:7f
-      ip: 172.17.64.11
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390013
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
index b26b4d1514196e4efe681b0863022e05a8453830..5f2dcc461a5f34956d70d4e7f499bca1d03e28e3 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-110:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.110
+      mac: 00:e0:81:d5:07:6c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:6d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:6e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.110
       ip6: fe80::202:c903:b:5ca9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.110
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:aa
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:6c
-      ip6: fe80::2e0:81ff:fed5:76c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.110
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:6f
-      ip: 172.17.64.110
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390112
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
index a9531adf4004ed6bf97d3694e12a63c7ec03b69a..cad9cb11a462bff2159bed87658e1de8d5d636e2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-111:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.111
+      mac: 00:e0:81:d5:08:58
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:59
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:5a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:91
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.111
       ip6: fe80::202:c903:c:5591
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.111
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0c:55:92
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:58
-      ip6: fe80::2e0:81ff:fed5:858
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.111
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:5b
-      ip: 172.17.64.111
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390113b
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
index 65871e4e0c924825b0eccf8225d241981dfec759..60044f56f82792a59775d03cdcf31fe558492791 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-112:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.112
+      mac: 00:e0:81:d5:08:10
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:11
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:12
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.112
       ip6: fe80::202:c903:b:7e9d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.112
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:10
-      ip6: fe80::2e0:81ff:fed5:810
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.112
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:12
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:13
-      ip: 172.17.64.112
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390114
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
index a25a44d71d24b731e13b1937afb616cfc80088d0..e95c4d0ce04c3c54e6a4bdf62f1d2fdd9424abe8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-113:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.113
+      mac: 00:e0:81:d5:07:bc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:bd
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:be
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.113
       ip6: fe80::202:c903:b:93b5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.113
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:bc
-      ip6: fe80::2e0:81ff:fed5:7bc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.113
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:bd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:be
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:bf
-      ip: 172.17.64.113
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390115
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
index a849fac0257e98a481512aaba3cd73617f67a447..6dee3970ff57684544feed95060899f8acea5866 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-114:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.114
+      mac: 00:e0:81:d5:06:b0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:b1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:b2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.114
       ip6: fe80::202:c903:b:93c5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.114
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:b0
-      ip6: fe80::2e0:81ff:fed5:6b0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.114
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:b2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:b3
-      ip: 172.17.64.114
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390116
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
index 39f85929490c22a255b0537d75027dde61d16872..15b5b527a217a4343c10bc22f696b6c2484a940e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-115:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.115
+      mac: 00:e0:81:d5:08:04
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:05
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:06
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.115
       ip6: fe80::202:c903:b:9305
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.115
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:06
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:04
-      ip6: fe80::2e0:81ff:fed5:804
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.115
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:05
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:07
-      ip: 172.17.64.115
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390117
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
index cd9b34eb06d798c423ebd709de8d66e4d983805b..711f588e3cbae45e8d5ac198aa7853b4193a2d97 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-116:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.116
+      mac: 00:e0:81:d5:08:28
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:29
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:2a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.116
       ip6: fe80::202:c903:b:931d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.116
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:28
-      ip6: fe80::2e0:81ff:fed5:828
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.116
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:2a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:2b
-      ip: 172.17.64.116
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390118
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
index 994cf1b9bb7095bd85118c1aeef12cb8dd79f738..52901b650906d1b9a3b720b40bbba24074d09928 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-117:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.117
+      mac: 00:e0:81:d5:06:e4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:e5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:e6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.117
       ip6: fe80::202:c903:b:9325
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.117
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:26
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:e4
-      ip6: fe80::2e0:81ff:fed5:6e4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.117
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:e7
-      ip: 172.17.64.117
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390119
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
index 9866f32ceff740673ebd680f3142d00fad4ca882..c824512b23a46ee6b1521aa130a98567545502f7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-118:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.118
+      mac: 00:e0:81:d5:07:b8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:b9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:ba
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.118
       ip6: fe80::202:c903:b:92d9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.118
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:da
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:b8
-      ip6: fe80::2e0:81ff:fed5:7b8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.118
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:bb
-      ip: 172.17.64.118
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390120
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
index cf6eef89609a0a8ddf871b1fdc3e51a8dd4fe039..ed94262216c2b4333a586b13670437307e967501 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-119:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.119
+      mac: 00:e0:81:d5:06:f0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:f1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:f2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.119
       ip6: fe80::202:c903:b:9319
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.119
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:f0
-      ip6: fe80::2e0:81ff:fed5:6f0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.119
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:f2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:f3
-      ip: 172.17.64.119
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390121
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
index 1e228f5be0990c841133ca1b9e515c4ff8635c85..6aa8e4a6b2936937a6ead9cbc7c364c21b7b6c7b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-12:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.12
+      mac: 00:e0:81:d5:07:8c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:8d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:8e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.12
       ip6: fe80::202:c903:b:9381
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.12
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:82
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:8c
-      ip6: fe80::2e0:81ff:fed5:78c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.12
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:8e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:8f
-      ip: 172.17.64.12
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390014
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
index 5668018e38020620ec01792a83d8d7d5fb02f61a..60acec82c757ba2bf02d57d426935a28a69f8e6d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-120:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.120
+      mac: 00:e0:81:d5:08:ac
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:ad
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:ae
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.120
       ip6: fe80::202:c903:b:9329
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.120
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:ac
-      ip6: fe80::2e0:81ff:fed5:8ac
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.120
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ae
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:af
-      ip: 172.17.64.120
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390122
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
index 30eb3a278ef92a4cdbc6c04db5d5fc0b4d9fa8ef..088ff53b2b27a44a25efc5f1df2d7d3b52810c2f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-121:
+  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: 
+  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:93:2d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:932d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.121
-      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:93:2e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:38
-      ip6: fe80::2e0:81ff:fed5:738
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.121
+      mac: 00:e0:81:d5:07:38
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:39
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:3a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:3b
-      ip: 172.17.64.121
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390123
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
index b45dee2dc9674b46f1fe89f088e6c85da978e4d8..40c6ec9f362665bab4daf6b6d778b32f3142526e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-122:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.122
+      mac: 00:e0:81:d5:08:38
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:39
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:3a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.122
       ip6: fe80::202:c903:b:5d85
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.122
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:86
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:38
-      ip6: fe80::2e0:81ff:fed5:838
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.122
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:3a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:3b
-      ip: 172.17.64.122
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390124
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
index d9d640294a90d5ad969e38f84c72819cdaa490e5..f58a20487d6cf0993b068e7fbbbf67cbdfed9a8c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-124:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.124
+      mac: 00:e0:81:d5:06:a4
+      management: false
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61 
-      rate: 20000000000
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:a5
       management: false
-      enabled: true
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:a6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61
       interface: InfiniBand
-      version: MT26418
       ip: 172.18.64.124
       ip6: fe80::202:c903:2:7f61
-      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:02:7f:62 
-      rate: 10000000000
       management: false
-      enabled: false
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
+    ib1:
       driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:a4
-      ip6: fe80::2e0:81ff:fed5:6a4
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.124
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:a5
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62
+      interface: InfiniBand
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:06:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:a7
-      ip: 172.17.64.124
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390126
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
index e799059102d315667f21fd68f8b4ccb0ce5e7db4..d42d60a67879e0446e19ed6af962b82497c3be1b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-125:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.125
+      mac: 00:e0:81:d5:08:68
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:69
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:6a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.125
       ip6: fe80::202:c903:b:9391
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.125
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:92
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:68
-      ip6: fe80::2e0:81ff:fed5:868
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.125
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:6b
-      ip: 172.17.64.125
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390127
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
index 0c79caabe1c85803d145a3516a392d686c3a301a..b3a71177a600a1fd9c3663b976da0557417c7a43 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-126:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.126
+      mac: 00:e0:81:d5:08:d0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:d1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:d2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:51
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.126
       ip6: fe80::202:c903:b:9151
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.126
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:52
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:d0
-      ip6: fe80::2e0:81ff:fed5:8d0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.126
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:d2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:d3
-      ip: 172.17.64.126
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390128
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
index b9993f4705681a63f0b153b8dadc6a2495b2d2c4..3fcffa733ab70725b6a791a5aa36df6889d137c9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-127:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.127
+      mac: 00:e0:81:d5:08:40
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:41
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:42
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.127
       ip6: fe80::202:c903:b:9285
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.127
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:86
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:40
-      ip6: fe80::2e0:81ff:fed5:840
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.127
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:42
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:43
-      ip: 172.17.64.127
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390129
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
index 7498ed639e47e48f7a3a7430f6f475ee3943f004..7bba007fe0f759a0be97e984fc87c919a95851ad 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-128:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.128
+      mac: 00:e0:81:d5:08:e4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:e5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:e6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.128
       ip6: fe80::202:c903:b:9215
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.128
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:16
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:e4
-      ip6: fe80::2e0:81ff:fed5:8e4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.128
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:e7
-      ip: 172.17.64.128
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390130
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
index 0ce31678d261a81a276e29ff5cbfcc2a05ad667e..ebab3b987cfcb8040565dcd06003c383c39003e2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-129:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.129
+      mac: 00:e0:81:d5:07:1c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:1d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:1e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.129
       ip6: fe80::202:c903:b:9205
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.129
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:06
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:1c
-      ip6: fe80::2e0:81ff:fed5:71c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.129
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:1d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:1e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:1f
-      ip: 172.17.64.129
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390131
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
index 4922629cce790dd14acd08ce2a214dcdda48143d..97b9ccbc15460995e80819770eedfee4da8b7ee5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-13:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.13
+      mac: 00:e0:81:d5:06:fc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:fd
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:fe
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.13
       ip6: fe80::202:c903:b:9385
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.13
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:86
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:fc
-      ip6: fe80::2e0:81ff:fed5:6fc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.13
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:fd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:fe
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:ff
-      ip: 172.17.64.13
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390015
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
index 04db2ff79fdbf7b994b5426cccbdc7fe51582006..509697981b802dec048b8f11dda987fd887ab531 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-130:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.130
+      mac: 00:e0:81:d2:5a:34
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d2:5a:35
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d2:5a:36
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.130
       ip6: fe80::202:c903:b:9209
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.130
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d2:5a:34
-      ip6: fe80::2e0:81ff:fed2:5a34
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.130
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d2:5a:35
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d2:5a:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d2:5a:37
-      ip: 172.17.64.130
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390132b
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
index 9cc4be2f03a88bc98ce51371f1dcd803599be479..58fcd208a0b5d88c6c80df6ecbbfc707e9b8af1e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-131:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  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:4d 
-      rate: 20000000000
-      ip6: fe80::202:c903:b:914d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.131
-      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:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:f8
-      ip6: fe80::2e0:81ff:fed5:6f8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.131
+      mac: 00:e0:81:d5:06:f8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:06:f9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:06:fa
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:fb
-      ip: 172.17.64.131
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d
+      interface: InfiniBand
+      ip: 172.18.64.131
+      ip6: fe80::202:c903:b:914d
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390133b
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
index 6dd57bfc475a52b67306ac710aa9435187e7a603..7b1b2eac753949d8fa234b37c418d9daea0392f5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-132:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  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:0d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:920d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.132
-      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:0e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:8c
-      ip6: fe80::2e0:81ff:fed5:88c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.132
+      mac: 00:e0:81:d5:08:8c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:8d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:8e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:8f
-      ip: 172.17.64.132
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390134
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
index 0d7c0a02ad2dda91c77719c9a25e80723ce30712..a8756386187cce0f22c67e0a99b86635a90913e6 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-133:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.133
+      mac: 00:e0:81:d5:07:e0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:e1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:e2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.133
       ip6: fe80::202:c903:5:f7b3
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.133
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b4
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:e0
-      ip6: fe80::2e0:81ff:fed5:7e0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.133
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:e3
-      ip: 172.17.64.133
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390135
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
index 219820683ff2b4566439f28e3e1850fbd1b9ad8b..4706bf5eb2d441ba22c9a58f798e1a900d3ba648 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-134:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.134
+      mac: 00:e0:81:d5:08:e8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:e9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:ea
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.134
       ip6: fe80::202:c903:5:f44f
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.134
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:50
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:e8
-      ip6: fe80::2e0:81ff:fed5:8e8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.134
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:eb
-      ip: 172.17.64.134
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390136
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
index fedea5cec0821a416958163fdcd77e371d2a85e4..ecba21de88acc8745ec76785401ea5578625e57f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-135:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.135
+      mac: 00:e0:81:d5:06:70
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:71
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:72
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.135
       ip6: fe80::202:c903:5:f4c7
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.135
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c8
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:70
-      ip6: fe80::2e0:81ff:fed5:670
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.135
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:73
-      ip: 172.17.64.135
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390137
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
index a3a934e9657e269515a1aa1cef6f99be1652cef2..df565d924fcfca5ae1fc3ee34bde0e9adf7d68ff 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-136:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.136
+      mac: 00:e0:81:d5:07:7c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:7d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:7e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.136
       ip6: fe80::202:c903:5:f847
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.136
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:48
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:7c
-      ip6: fe80::2e0:81ff:fed5:77c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.136
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:7e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:7f
-      ip: 172.17.64.136
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390138
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
index 2403dd1b11fee93cc4385ff1ac8859efc4d6197a..d8f0859d58d0ddb8b449def6822c7d4d22836a34 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-137:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.137
+      mac: 00:e0:81:d5:08:44
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:45
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:46
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.137
       ip6: fe80::202:c903:5:f647
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.137
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f6:48
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:44
-      ip6: fe80::2e0:81ff:fed5:844
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.137
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:46
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:47
-      ip: 172.17.64.137
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390139
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
index 9c8d40664631981bee87e05311182443be8e3449..6a9e048f99c00aab0ea57717aa940fcdc05a8efb 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-138:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.138
+      mac: 00:e0:81:d5:08:c4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:c5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:c6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.138
       ip6: fe80::202:c903:5:f4c3
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.138
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c4
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:c4
-      ip6: fe80::2e0:81ff:fed5:8c4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.138
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:c7
-      ip: 172.17.64.138
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390140b
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
index 0240f5394dccbba1364fc96fcd8c14858bed1937..2cc7f33a5853aae2ca623783aedb7c4a8f130e71 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-139:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.139
+      mac: 00:e0:81:d5:07:80
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:81
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:82
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.139
       ip6: fe80::202:c903:5:f7ff
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.139
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f8:00
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:80
-      ip6: fe80::2e0:81ff:fed5:780
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.139
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:83
-      ip: 172.17.64.139
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390141
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
index 32d0caf98a8a102f39d5c20c7da3c78161d63cf7..a614cc4dc215054d6cf8629e77f71a9115c7a6b8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-14:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.14
+      mac: 00:e0:81:d5:06:d4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:d5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:d6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.14
       ip6: fe80::202:c903:b:93e1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.14
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:d4
-      ip6: fe80::2e0:81ff:fed5:6d4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.14
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:d6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:d7
-      ip: 172.17.64.14
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390016
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
index 74b9ef26a4d555fe9d62d2d1bed2c4a40c4127f2..e1920d91012f98ec6457aa816d388e40f912f9d9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-140:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.140
+      mac: 00:e0:81:d5:07:78
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:79
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:7a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.140
       ip6: fe80::202:c903:5:f79f
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.140
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a0
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:78
-      ip6: fe80::2e0:81ff:fed5:778
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.140
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:7a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:7b
-      ip: 172.17.64.140
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390142
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
index 5c2d05ab7d07ec0c1f47cbf312a1a0a594907025..e96b3c5d54b19a56e54dd53efc50b7b0e3e01ec2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-141:
+  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
-      device: sda
-      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: 
+  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:f7:93
-      rate: 20000000000
-      ip6: fe80::202:c903:5:f793
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.141
-      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:f7:94
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:74
-      ip6: fe80::2e0:81ff:fed5:874
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.141
+      mac: 00:e0:81:d5:08:74
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:75
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:76
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:77
-      ip: 172.17.64.141
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390143
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
index 1b7483a577c77a26890d7905bb3bc9455bec52c6..a4b27bdddd7f5608d4d8718f2b14696a7cbeeb65 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-142:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.142
+      mac: 00:e0:81:d5:06:8c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:8d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:8e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.142
       ip6: fe80::202:c903:5:f7a7
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.142
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a8
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:8c
-      ip6: fe80::2e0:81ff:fed5:68c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.142
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:8d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:8e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:8f
-      ip: 172.17.64.142
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390144
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
index 14a4f9ca58ca86ce670a2c933554e7b9073f4d6f..4ed2973709f1fe1023ac54e7d6e3b4671699e8e5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-143:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.143
+      mac: 00:e0:81:d5:07:94
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:95
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:96
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.143
       ip6: fe80::202:c903:5:f497
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.143
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:05:f4:98
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:94
-      ip6: fe80::2e0:81ff:fed5:794
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.143
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:97
-      ip: 172.17.64.143
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390145
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
index 1aea05b5946f2cfe6908dbf540b89136d0f1f976..6d41722919ec5b86ba618f93bd73635414089d3e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-15:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.15
+      mac: 00:e0:81:d5:07:e8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:e9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:ea
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.15
       ip6: fe80::202:c903:b:93c9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.15
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ca
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:e8
-      ip6: fe80::2e0:81ff:fed5:7e8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.15
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:eb
-      ip: 172.17.64.15
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390017
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
index 680949817b7a7b29f65dc76de86317d92c5835aa..7fed49396173ca2072a3cd0a0679cfc266844b7b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-16:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.16
+      mac: 00:e0:81:d5:07:c0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:c1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:c2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.16
       ip6: fe80::202:c903:b:9375
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.16
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:76
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:c0
-      ip6: fe80::2e0:81ff:fed5:7c0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.16
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:c1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:c2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:c3
-      ip: 172.17.64.16
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390018
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
index 1cdc0b6eb4e167dee6390c3c18d0635e7826c6fe..c6270ce3692764d242eea3b88a289c28e52d88fe 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-17:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.17
+      mac: 00:e0:81:d5:08:a8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:a9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:aa
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.17
       ip6: fe80::202:c903:b:9371
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.17
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:72
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:a8
-      ip6: fe80::2e0:81ff:fed5:8a8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.17
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:aa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:ab
-      ip: 172.17.64.17
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390019
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
index a1cc75fee5bf6fa4133b07cfae3c67098deaf6f2..ee6604c9817c586e99b60a681ee7902288d581d5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-18:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.18
+      mac: 00:e0:81:d5:08:3c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:3d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:3e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.18
       ip6: fe80::202:c903:b:937d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.18
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:3c
-      ip6: fe80::2e0:81ff:fed5:83c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.18
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:3f
-      ip: 172.17.64.18
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390020
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
index a50b2b77a9eb281ad5c9ca11a4e533e0c8856ea0..b909e60c102d009207859e1fc8e67f9b12004900 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-19:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.19
+      mac: 00:e0:81:d5:08:b4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:b5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:b6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.19
       ip6: fe80::202:c903:b:9155
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.19
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:56
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:b4
-      ip6: fe80::2e0:81ff:fed5:8b4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.19
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:b6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:b7
-      ip: 172.17.64.19
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390021
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
index a035d2dd72e1b8a5d9178c2674bb18728044d3d9..381a913c61bf7d32c84a7b125a76496852958479 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-2:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.2
+      mac: 00:e0:81:d5:07:70
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:71
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:72
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.2
       ip6: fe80::202:c903:b:915d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.2
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:70
-      ip6: fe80::2e0:81ff:fed5:770
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.2
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:72
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:73
-      ip: 172.17.64.2
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390004
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
index 3df147fbb10abffa9920a930902945b043ef291c..b596d2b99ad5d023660f15fe134bdf97a79803a2 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-20:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.20
+      mac: 00:e0:81:d5:07:68
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:69
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:6a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.20
       ip6: fe80::202:c903:b:9145
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.20
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:46
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:68
-      ip6: fe80::2e0:81ff:fed5:768
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.20
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:6b
-      ip: 172.17.64.20
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390022
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
index 00140c2eca325297f0dc0465f6d6cfebea6c82af..f1bf3ad14d9f45765f74ce55cd347cc52d137e21 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-21:
+  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: 
+  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:04:53:6d 
-      rate: 20000000000
-      ip6: fe80::202:c903:4:536d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.21
-      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:04:53:6e 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d2:59:f8
-      ip6: fe80::2e0:81ff:fed2:59f8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.21
+      mac: 00:e0:81:d2:59:f8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d2:59:f9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d2:59:fa
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d2:59:fb
-      ip: 172.17.64.21
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6d
+      interface: InfiniBand
+      ip: 172.18.64.21
+      ip6: fe80::202:c903:4:536d
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:53:6e
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390023b
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
index 3812b5cc2f66b61ed96204215322b9c098e94672..318eb9dbbc041cc7eb9324c98a5de127d94b0a7e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-22:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.22
+      mac: 00:e0:81:d5:07:d8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:d9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:da
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.22
       ip6: fe80::202:c903:b:9379
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.22
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:d8
-      ip6: fe80::2e0:81ff:fed5:7d8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.22
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:db
-      ip: 172.17.64.22
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390024
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
index 760db0edb4a7104e71f2dadfec6e98a89e9c7955..cc7e68c39854e36dc5e7526aaa58f9b08de678a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-23:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.23
+      mac: 00:e0:81:d5:06:c4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:c5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:c6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.23
       ip6: fe80::202:c903:b:9365
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.23
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:66
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:c4
-      ip6: fe80::2e0:81ff:fed5:6c4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.23
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:c7
-      ip: 172.17.64.23
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390025
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
index 5a6fae38d2796ca1676bedaf3374b4d6ecb68b40..6dc8509f638595ac7b1efb3a4ae947b1d5a5a05a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-25:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.25
+      mac: 00:e0:81:d5:07:50
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:51
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:52
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.25
       ip6: fe80::202:c903:b:92a5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.25
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:50
-      ip6: fe80::2e0:81ff:fed5:750
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.25
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:53
-      ip: 172.17.64.25
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390027
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
index 8f60736b29f56b0aa695d062794ad528dfba9c8f..49b6d7d0286a976f0513d44ca3e3052ab5f183e0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-26:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  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:9d
-      rate: 20000000000
-      ip6: fe80::202:c903:b:929d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.26
-      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:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:6c
-      ip6: fe80::2e0:81ff:fed5:86c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.26
+      mac: 00:e0:81:d5:08:6c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:6d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:6e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:6f
-      ip: 172.17.64.26
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390028
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
index ef140b89a8573be5c8145b394eeb02d4124572f7..f7bbd6047b0601f4a358aa7b696b3dd68d395775 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-27:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.27
+      mac: 00:e0:81:d5:07:5c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:5d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:5e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.27
       ip6: fe80::202:c903:b:9289
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.27
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:5c
-      ip6: fe80::2e0:81ff:fed5:75c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.27
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:5f
-      ip: 172.17.64.27
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390029
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
index 1ff94dae01d611ea81e57a24a27ef1546b0c61b0..4977d5ac6753b9be30d9b5c2fb094b7fb2370835 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-29:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.29
+      mac: 00:e0:81:d5:06:54
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:55
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:56
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.29
       ip6: fe80::202:c903:b:90dd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.29
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:de
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:54 
-      ip6: fe80::2e0:81ff:fed5:654
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.29
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:06:56
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:57
-      ip: 172.17.64.29
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390031
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
index ce85097c7aab199a0d73e07eb948e2a6cf2b0b6e..fbb01c7da7e99adc981d8b96cd919eac81f70965 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-30:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  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:79
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9279
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.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:0b:92:7a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:ec
-      ip6: fe80::2e0:81ff:fed5:8ec
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.30
+      mac: 00:e0:81:d5:08:ec
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:ed
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:ee
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:ef
-      ip: 172.17.64.30
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390032
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
index 79688db27388ddcfae0bb24337e6e47623400125..1d7b94dbf890bf7f492fc85f6d4b0fc6f1060309 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-31:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.31
+      mac: 00:e0:81:d5:06:60
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:61
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:62
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.31
       ip6: fe80::202:c903:b:921d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.31
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:60
-      ip6: fe80::2e0:81ff:fed5:660
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.31
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:63
-      ip: 172.17.64.31
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390033
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
index 9ebb8a3c38f28817cbd869b1fc852e529e45ba4d..7624cff2766f3daa65cf97b4679b2bfa5b31cb86 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-32:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.32
+      mac: 00:e0:81:d5:06:c8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:c9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:ca
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.32
       ip6: fe80::202:c903:b:927d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.32
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:c8
-      ip6: fe80::2e0:81ff:fed5:6c8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.32
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:c9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ca
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:cb
-      ip: 172.17.64.32
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390034
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
index 96b32c390f0674afbaba8d2b14a2f79d612383f8..66eccc8c73ad85437264f3fb58a290542be3cae5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-33:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.33
+      mac: 00:e0:81:d5:06:6c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:6d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:6e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.33
       ip6: fe80::202:c903:b:90d9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.33
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:90:da
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:6c
-      ip6: fe80::2e0:81ff:fed5:66c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.33
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:6f
-      ip: 172.17.64.33
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390035
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
index 7fbbde4e5df3a06f6cc5af874de1f165475ae4c1..cd3c13cf15ac4463bb54ef3f8c91ad15b872ba23 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-34:
+  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
-      device: sda
-      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: 
+  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:65
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9165
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.34
-      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:66
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:9c
-      ip6: fe80::2e0:81ff:fed5:89c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.34
+      mac: 00:e0:81:d5:08:9c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:9d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:9e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:9f
-      ip: 172.17.64.34
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390036
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
index dd1cb7f4b29f1c843c7f8af0306692fc46a893e2..138210787f7e5833b15086eb6084888cdeb78895 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-35:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.35
+      mac: 00:e0:81:d5:08:1c
+      management: false
       mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef 
-      rate: 20000000000
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:1d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:1e
       management: false
-      enabled: true
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:ef
       interface: InfiniBand
-      version: MT26418
       ip: 172.18.64.35
       ip6: fe80::202:c903:1:d5ef
-      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:01:d5:f0
-      rate: 10000000000
       management: false
-      enabled: false
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
+    ib1:
       driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:1c
-      ip6: fe80::2e0:81ff:fed5:81c
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.35
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:1d
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:01:d5:f0
+      interface: InfiniBand
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:08:1e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:1f
-      ip: 172.17.64.35
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390037
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
index 0e33c44575e46f013188ed42d4ffe85a7363d988..36fca2ec8528b744d5ac1ccf14014f4caaa6e520 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-36:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.36
+      mac: 00:e0:81:d5:06:48
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:49
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:4a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.36
       ip6: fe80::202:c903:b:92b9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.36
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ba
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:48
-      ip6: fe80::2e0:81ff:fed5:648
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.36
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:4a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:4b
-      ip: 172.17.64.36
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390038
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
index 7e809348f1e8168469f55da3610e0b173b0bf520..107479e239fd783fd96cbbdba1fae04455d104d1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-37:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.37
+      mac: 00:e0:81:d5:08:a4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:a5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:a6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.37
       ip6: fe80::202:c903:b:92c5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.37
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:a4
-      ip6: fe80::2e0:81ff:fed5:8a4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.37
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:a7
-      ip: 172.17.64.37
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390039
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
index 259f78b28ad39d49d76c395db4bf97cf3f7cf2ac..e37c551610ab11bd4c75da26efa43231df677192 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-38:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.38
+      mac: 00:e0:81:d5:07:30
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:31
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:32
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.38
       ip6: fe80::202:c903:b:92b1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.38
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:30
-      ip6: fe80::2e0:81ff:fed5:730
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.38
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:32
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:33
-      ip: 172.17.64.38
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390040
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
index d15cf02cbfd8ae42189eaee63c76248bc190337c..4ce9dd2803b49dabf2c975b282019a8413062afc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-4:
+  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: 
+  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:bd 
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92bd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.4
-      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:be 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:54
-      ip6: fe80::2e0:81ff:fed5:854
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.4
+      mac: 00:e0:81:d5:08:54
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:55
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:56
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:57
-      ip: 172.17.64.4
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd
+      interface: InfiniBand
+      ip: 172.18.64.4
+      ip6: fe80::202:c903:b:92bd
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390096b
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
index 5587d6cc50396fa9d561828e01efe6d2ce0d4167..c5ec1ad016b7f9f7bf87b868a983d872442c46c5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-40:
+  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: 
+  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:93:cd 
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93cd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.40
-      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:93:ce 
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:f4
-      ip6: fe80::2e0:81ff:fed5:6f4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.40
+      mac: 00:e0:81:d5:06:f4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:06:f5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:06:f6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:f7
-      ip: 172.17.64.40
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd
+      interface: InfiniBand
+      ip: 172.18.64.40
+      ip6: fe80::202:c903:b:93cd
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ce
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390042
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
index 94717cf1f8450cf5320f66bb5e40b1930b53e3a8..ab16733d770277878e2cf265746b0646f0ea9569 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-41:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.41
+      mac: 00:e0:81:d5:07:ac
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:ad
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:ae
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.41
       ip6: fe80::202:c903:b:9299
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.41
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:ac
-      ip6: fe80::2e0:81ff:fed5:7ac
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.41
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:ad
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:ae
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:af
-      ip: 172.17.64.41
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390043
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
index bfaf65ee0e5a3559b9af7ff18806f92dd289d955..e18421f29aff82b0f93246a7f28f1885a81b21ce 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-42:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.42
+      mac: 00:e0:81:d5:07:88
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:89
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:8a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.42
       ip6: fe80::202:c903:b:92a9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.42
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:aa
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:88
-      ip6: fe80::2e0:81ff:fed5:788
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.42
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:8b
-      ip: 172.17.64.42
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390044
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
index aae599a40ff61267b7b0a720a193f90e807d24a0..8917b78812d3fdc82be57843e4cc29ef4611155b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-43:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.43
+      mac: 00:e0:81:d5:08:24
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:25
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:26
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.43
       ip6: fe80::202:c903:b:92ad
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.43
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ae
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:24
-      ip6: fe80::2e0:81ff:fed5:824
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.43
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:27
-      ip: 172.17.64.43
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390045
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
index f10d7b01861d72122a2dd4d6e403b1a29ef58767..04632348152df6fd8f85eada648fc7e3f36fc5dc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-44:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.44
+      mac: 00:e0:81:d5:06:e0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:e1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:e2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.44
       ip6: fe80::202:c903:b:92b5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.44
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:e0
-      ip6: fe80::2e0:81ff:fed5:6e0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.44
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:e2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:e3
-      ip: 172.17.64.44
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390046
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
index bf4042519679275ce24bd0b0b43658a4d9ea2bf3..f939d444d4ecb7835305a821c1c5a751c43aee87 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-46:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.46
+      mac: 00:e0:81:d5:06:94
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:95
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:96
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.46
       ip6: fe80::202:c903:b:93d5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.46
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:94
-      ip6: fe80::2e0:81ff:fed5:694
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.46
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:97
-      ip: 172.17.64.46
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390048
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
index 44ee67d3547ebb9c17e3068d71af97951298da73..ea618f96b144c6b873c32f0dd8527e13dfed0053 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-47:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.47
+      mac: 00:e0:81:d5:08:94
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:95
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:96
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.47
       ip6: fe80::202:c903:b:93e5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.47
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:94
-      ip6: fe80::2e0:81ff:fed5:894
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.47
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:95
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:96
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:97
-      ip: 172.17.64.47
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390049
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
index 4e0f6e29042765eae40e5fcaf03a9aebcbdbc484..bef95fbb593b944d25bb25d3a2be2f05d0d5153f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-48:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.48
+      mac: 00:e0:81:d5:06:e8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:e9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:ea
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.48
       ip6: fe80::202:c903:b:93dd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.48
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:de
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:e8
-      ip6: fe80::2e0:81ff:fed5:6e8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.48
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:e9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ea
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:eb
-      ip: 172.17.64.48
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390050
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
index 706cb4ca690c73f7b28a0186720f60e6a70087c3..ce94e23e744a8609a5754943db45c6484cd0ec90 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-49:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.49
+      mac: 00:e0:81:d5:08:5c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:5d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:5e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.49
       ip6: fe80::202:c903:b:93d1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.49
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:5c
-      ip6: fe80::2e0:81ff:fed5:85c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.49
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:5d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:5e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:5f
-      ip: 172.17.64.49
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390051
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
index d9e5eca81e136907b3aa1c7953cf2f5f162325cd..07d578a2c085eaf2e77ba1a79244c607b32b4ecc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-5:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.5
+      mac: 00:e0:81:d5:08:b8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:b9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:ba
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.5
       ip6: fe80::202:c903:b:9179
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.5
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:b8
-      ip6: fe80::2e0:81ff:fed5:8b8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.5
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:b9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:ba
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:bb
-      ip: 172.17.64.5
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390007
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
index 6bac76e99d71fd770cd440fcaf3580dad160fd83..9afcd84940f2763b8625ee93393aca4772369f25 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-50:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.50
+      mac: 00:e0:81:d5:06:74
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:75
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:76
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.50
       ip6: fe80::202:c903:b:92f1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.50
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:74
-      ip6: fe80::2e0:81ff:fed5:674
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.50
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:75
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:76
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:77
-      ip: 172.17.64.50
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390052
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
index 0f837deb30f1ce7c0c28676b622bfa0e2b40cb5c..a8366bd48ae46791f33e1e843527800cec4ac8fc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-51:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.51
+      mac: 00:e0:81:d5:07:60
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:61
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:62
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.51
       ip6: fe80::202:c903:b:92e9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.51
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ea
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:60
-      ip6: fe80::2e0:81ff:fed5:760
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.51
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:63
-      ip: 172.17.64.51
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390053
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
index 88212f342c6b4399accc7f027f57e31f1abc87f9..5517a5188cce4a839ba2134c6c6577cf6e552bc7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-53:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.53
+      mac: 00:e0:81:d5:07:f8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:f9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:fa
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.53
       ip6: fe80::202:c903:b:9309
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.53
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:f8
-      ip6: fe80::2e0:81ff:fed5:7f8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.53
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:fa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:fb
-      ip: 172.17.64.53
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390055
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
index b3d5b936464a7be7eb34a05ae3fe125e258e4e56..bf7b71f91012559b5256a8ac6de9b7e144ce88b7 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-54:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.54
+      mac: 00:e0:81:d5:07:a8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:a9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:aa
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.54
       ip6: fe80::202:c903:b:9315
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.54
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:16
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:a8
-      ip6: fe80::2e0:81ff:fed5:7a8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.54
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:aa
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:ab
-      ip: 172.17.64.54
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390056
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
index 3055431253488c9b3f6c8227bcbfd174f4998563..e7b89116441f37df614f8c8909d6a4f3eff7e018 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-55:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.55
+      mac: 00:e0:81:d5:08:90
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:91
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:92
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.55
       ip6: fe80::202:c903:b:930d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.55
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:90
-      ip6: fe80::2e0:81ff:fed5:890
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.55
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:92
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:93
-      ip: 172.17.64.55
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390057
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
index cf9682a5cbe31410ba11e6bd2ac46bb6eaf96b66..f9fd44f79c2196e80f2e101903f156256bcd5156 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-56:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.56
+      mac: 00:e0:81:d5:06:78
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:79
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:7a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.56
       ip6: fe80::202:c903:b:9189
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.56
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:78
-      ip6: fe80::2e0:81ff:fed5:678
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.56
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:7a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:7b
-      ip: 172.17.64.56
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390058
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
index f4b04877f8ec6d6a53b82c86342c584d84081e4f..9ec40104ba7304c420c1e2ad8be67adeddb16c7b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-57:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.57
+      mac: 00:e0:81:d5:08:a0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:a1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:a2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.57
       ip6: fe80::202:c903:b:918d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.57
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:a0
-      ip6: fe80::2e0:81ff:fed5:8a0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.57
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:a3
-      ip: 172.17.64.57
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390059
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
index 7a7ca3097c43afd3ae67b42370dfbcf016493a47..23a13dd5526175a4d0c1c662fab989bd95d3cb02 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-58:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.58
+      mac: 00:e0:81:d5:07:34
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:35
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:36
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.58
       ip6: fe80::202:c903:b:919d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.58
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:34
-      ip6: fe80::2e0:81ff:fed5:734
-      management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.58
-    eth1:
-      mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:35
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
-      mac: 00:e0:81:d5:07:36
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:37
-      ip: 172.17.64.58
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDP72503
       device: sda
+      model: Hitachi HDP72503
+      rev: A52A
       size: 320072933376
-      rev: A52A 
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
   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: 1009390060
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
index 7c792caff4147e93117ef9f639d40450aedb4b6c..ca48f00f61e598fa7a5bb29d90d386baf6a9e9e5 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-59:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.59
+      mac: 00:e0:81:d5:07:2c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:2d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:2e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.59
       ip6: fe80::202:c903:b:9195
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.59
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:96
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:2c
-      ip6: fe80::2e0:81ff:fed5:72c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.59
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:2e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:2f
-      ip: 172.17.64.59
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390061
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
index efb00c2de3c724a53b1c1170324d790654d2ffd2..23426ac4f573ddf7df2b7c901e6734255d320048 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-6:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.6
+      mac: 00:e0:81:d5:06:ec
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:ed
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:ee
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.6
       ip6: fe80::202:c903:b:917d
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.6
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7e
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:ec
-      ip6: fe80::2e0:81ff:fed5:6ec
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.6
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:ed
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:ee
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:ef
-      ip: 172.17.64.6
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390008
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
index bab285c7b97800e9474cc09f943d6ed6d9847110..8c5e64ce0f76f301342ec477afd17d63af24d8b1 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-60:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.60
+      mac: 00:e0:81:d5:08:4c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:4d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:4e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.60
       ip6: fe80::202:c903:b:9185
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.60
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:86
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:4c
-      ip6: fe80::2e0:81ff:fed5:84c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.60
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:4f
-      ip: 172.17.64.60
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390062
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
index a79278bb59765fe0ed57c9be172ef659cb78bff3..fd14044c41a9d5ba2ea8ec3059a6a09b5a41348c 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-61:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.61
+      mac: 00:e0:81:d5:07:00
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:01
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:02
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.61
       ip6: fe80::202:c903:b:9191
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.61
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:92
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:00
-      ip6: fe80::2e0:81ff:fed5:700
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.61
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:02
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:03
-      ip: 172.17.64.61
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390063
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
index 27e84a49426275377ef3e9f1517b1087da433dd2..fe2bc00f24e42d4739c4d757e2c06f111aa9a651 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-62:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.62
+      mac: 00:e0:81:d5:07:c4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:c5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:c6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.62
       ip6: fe80::202:c903:b:9199
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.62
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:c4
-      ip6: fe80::2e0:81ff:fed5:7c4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.62
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:c6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:c7
-      ip: 172.17.64.62
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390064
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
index dd8870dcd31c3bc809836eafb274450e48622830..593d3994ac65e7e5b7f2dd7af5d82265d9850e9f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-63:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.63
+      mac: 00:e0:81:d5:06:68
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:69
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:6a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.63
       ip6: fe80::202:c903:b:9181
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.63
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:82
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:68
-      ip6: fe80::2e0:81ff:fed5:668
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.63
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:69
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:6b
-      ip: 172.17.64.63
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390065
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
index 75343a6729cc5a3b31ad317ce937f8f2822a9ad4..84fbc8098684859b3b6ed3d0cce7cdc678a8e744 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-64:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.64
+      mac: 00:e0:81:d5:08:88
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:89
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:8a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.64
       ip6: fe80::202:c903:b:92a1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.64
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:88
-      ip6: fe80::2e0:81ff:fed5:888
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.64
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:89
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:8a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:8b
-      ip: 172.17.64.64
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390066
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
index 79477dc209b56eb0e2fde78182743ab4578dd741..dc1ebaee230f70933b814103ced037047eb7fc02 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-65:
+  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: 
+  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:93:d9
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93d9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.65
-      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:93:da
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:44
-      ip6: fe80::2e0:81ff:fed5:744
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.65
+      mac: 00:e0:81:d5:07:44
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:45
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:46
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:47
-      ip: 172.17.64.65
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390067
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
index 98ebe9c630beb4c4b096a75a09d98ccffe9c30af..1b7d17e082d4a6157e2a96fd89dc311919f0d906 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-66:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.66
+      mac: 00:e0:81:d5:08:14
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:15
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:16
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.66
       ip6: fe80::202:c903:b:9149
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.66
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:14
-      ip6: fe80::2e0:81ff:fed5:814
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.66
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:15
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:16
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:17
-      ip: 172.17.64.66
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390068
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
index b90750630439e70668f92a356bfbe702ca1e4f74..b5f413ab5795ca3865e1575d3d2ad0e54a4651a0 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-67:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.67
+      mac: 00:e0:81:d5:07:b0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:b1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:b2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.67
       ip6: fe80::202:c903:b:93b9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.67
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ba
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:b0
-      ip6: fe80::2e0:81ff:fed5:7b0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.67
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:b1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:b2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:b3
-      ip: 172.17.64.67
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390069
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
index d17ae3141beafa8b4b972927a391598f2fc7ba9f..27da898315a95ade9ad07542043e9d601187a443 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-68:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.68
+      mac: 00:e0:81:d5:06:50
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:51
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:52
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.68
       ip6: fe80::202:c903:b:9291
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.68
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:92
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:50
-      ip6: fe80::2e0:81ff:fed5:650
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.68
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:53
-      ip: 172.17.64.68
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390070
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
index c7f7b7de4b7331f4b21a54a50686dc4001ebfad7..1ec3482b19f4f2dd390460a3b0c7f08597f061da 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-69:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.69
+      mac: 00:e0:81:d5:06:98
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:99
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:9a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.69
       ip6: fe80::202:c903:b:93c1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.69
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:98
-      ip6: fe80::2e0:81ff:fed5:698
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.69
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:99
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:9a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:9b
-      ip: 172.17.64.69
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390071
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
index eb0534407aa06d2aee4b9b6d94aed95ef318be57..95e9496a589a0424153f84e070f7a6a03b803689 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-7:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.7
+      mac: 00:e0:81:d5:07:3c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:3d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:3e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.7
       ip6: fe80::202:c903:b:9161
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.7
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:62
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:3c
-      ip6: fe80::2e0:81ff:fed5:73c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.7
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:3e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:3f
-      ip: 172.17.64.7
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390009
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
index 164e21cdc431ce02e08741ff46ae041ab78ab0cd..346abfc4d111da145eaf8cb0408b6bdc8f54a817 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-70:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.70
+      mac: 00:e0:81:d5:07:4c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:4d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:4e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.70
       ip6: fe80::202:c903:b:9311
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.70
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:12
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:4c
-      ip6: fe80::2e0:81ff:fed5:74c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.70
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:4f
-      ip: 172.17.64.70
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390072
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
index fa8f81c0b5674cafa0b2a944d4d7e8578a8d1250..a6b64cb1e242a49ee536dd1fc6aa8c27d30d4754 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-71:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.71
+      mac: 00:e0:81:d5:07:28
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:29
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:2a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.71
       ip6: fe80::202:c903:b:92ed
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.71
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ee
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:28
-      ip6: fe80::2e0:81ff:fed5:728
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.71
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:2a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:2b
-      ip: 172.17.64.71
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390073
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
index e1d22094d0d0f860a6ac147e5eb083a150f50344..8efcaa880d6b36eb3c7f54fe189e640b4b61f0fe 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-72:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.72
+      mac: 00:e0:81:d5:07:e4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:e5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:e6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.72
       ip6: fe80::202:c903:b:9295
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.72
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:96
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:e4
-      ip6: fe80::2e0:81ff:fed5:7e4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.72
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:e6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:e7
-      ip: 172.17.64.72
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390074
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
index 1c10ad2f16e4a604548ff1e5aab52c617e4f4cb7..e119f7c1fa513c8e882b5f9232abc748ab3ea092 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-73:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.73
+      mac: 00:e0:81:d5:07:40
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:41
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:42
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.73
       ip6: fe80::202:c903:b:92fd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.73
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fe
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:40
-      ip6: fe80::2e0:81ff:fed5:740
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.73
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:42
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:43
-      ip: 172.17.64.73
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390075
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
index 220e9b16f1620dffd9ba24d7672a04b9c85a0d6c..9ebc739fb3944b6a9bde0c026b9908991d8f7d32 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-74:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.74
+      mac: 00:e0:81:d5:08:80
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:81
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:82
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.74
       ip6: fe80::202:c903:b:92dd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.74
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:de
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:80
-      ip6: fe80::2e0:81ff:fed5:880
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.74
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:82
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:83
-      ip: 172.17.64.74
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390076
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
index bbaa8344b440eddb589cfea0002298bed4972898..bb4b053d79b44f7496e4439dbf99b638c5c56666 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-75:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.75
+      mac: 00:e0:81:d5:07:04
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:05
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:06
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.75
       ip6: fe80::202:c903:b:92e5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.75
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:04
-      ip6: fe80::2e0:81ff:fed5:704
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.75
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:05
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:07
-      ip: 172.17.64.75
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390077
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
index 0f6f5f73f0de5e04d7788533e99b7e7c4fe6815b..c4f0703f4ce8721f83347bcc87fe528665f9948b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-76:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.76
+      mac: 00:e0:81:d5:07:20
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:21
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:22
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.76
       ip6: fe80::202:c903:b:92d5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.76
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:20
-      ip6: fe80::2e0:81ff:fed5:720
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.76
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:21
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:22
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:23
-      ip: 172.17.64.76
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390078
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
index 8d1bb1f28f2be68545f329e66fed21ddf265e2f1..1469ed3ae52fcf19f8daab2bf8553721bc1ce74e 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-77:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.77
+      mac: 00:e0:81:d5:07:a0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:a1
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:a2
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.77
       ip6: fe80::202:c903:b:92e1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.77
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:a0
-      ip6: fe80::2e0:81ff:fed5:7a0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.77
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:a2
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:a3
-      ip: 172.17.64.77
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390079
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
index 45e7477a32b0f3b84ce6a59e7ce1cd242fb831a9..3ee6153e86bfcc0025e253a12d569b93d1527e26 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-78:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.78
+      mac: 00:e0:81:d5:08:50
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:51
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:52
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.78
       ip6: fe80::202:c903:b:9301
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.78
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:02
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:50
-      ip6: fe80::2e0:81ff:fed5:850
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.78
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:51
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:53
-      ip: 172.17.64.78
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390080
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
index 2b67cb399ca18c4ac68d180b43d28a6ec8cb4dfd..dcbe8381d3e2cfe650e978a760dd4bf844af2b9d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-79:
+  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: 
+  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:f5
-      rate: 20000000000
-      ip6: fe80::202:c903:b:92f5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.79
-      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:f6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:78
-      ip6: fe80::2e0:81ff:fed5:878
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.79
+      mac: 00:e0:81:d5:08:78
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:79
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:7a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:7b
-      ip: 172.17.64.79
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390081
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
index 16e868f2df3354efa21cfc0a4513d747af458e2f..0ec9f917eb5b629e7fd64f13958460d08850c70b 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-8:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.8
+      mac: 00:e0:81:d5:08:08
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:09
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:0a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.8
       ip6: fe80::202:c903:b:9175
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.8
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:76
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:08
-      ip6: fe80::2e0:81ff:fed5:808
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.8
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:09
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:0a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:0b
-      ip: 172.17.64.8
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390010
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
index cd6e717eb72373eb72549576ca329d6b30fe6417..218aae935c40acbf893f2d4d096bbb1557e1de59 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-80:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.80
+      mac: 00:e0:81:d5:06:d8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:d9
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:da
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.80
       ip6: fe80::202:c903:b:92d1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.80
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:d8
-      ip6: fe80::2e0:81ff:fed5:6d8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.80
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:d9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:db
-      ip: 172.17.64.80
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390082
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
index 9ee0eb7139b2ad9a8f5f887706bd74345686140c..cc11d0a4cbe252e218a1e606091b58030c96036f 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-81:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.81
+      mac: 00:e0:81:d5:07:24
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:25
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:26
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.81
       ip6: fe80::202:c903:b:93a9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.81
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:aa
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:24
-      ip6: fe80::2e0:81ff:fed5:724
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.81
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:26
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:27
-      ip: 172.17.64.81
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390083
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
index be9d22816b9cbd499715940ddfb6c8594f79dcf6..1008ead317e51445d31332e5953930c80ccaf679 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-82:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.82
+      mac: 00:e0:81:d5:07:b4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:b5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:b6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.82
       ip6: fe80::202:c903:b:9395
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.82
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:96
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:b4
-      ip6: fe80::2e0:81ff:fed5:7b4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.82
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:b6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:b7
-      ip: 172.17.64.82
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390084
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
index 2da2316a6f113392ec69f1533a4351dcea0a3f7b..8c74d76e5e7c2c6b67e4e5e92a50aa5476496e4d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-83:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.83
+      mac: 00:e0:81:d5:06:90
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:91
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:92
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.83
       ip6: fe80::202:c903:b:93a5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.83
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:90
-      ip6: fe80::2e0:81ff:fed5:690
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.83
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:91
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:92
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:93
-      ip: 172.17.64.83
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390085
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
index dc1cd27c2fe77dcff1ecb527627c8d93430e1c85..2dd7269e7dd42a73aaab2fe73d4e802b8c5367c8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-84:
+  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: 
+  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:93:9d
-      rate: 20000000000 
-      management: false
-      enabled: true 
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.84
-      ip6: fe80::202:c903:b:939d 
-      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:93:9e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:18
-      ip6: fe80::2e0:81ff:fed5:718
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.84
+      mac: 00:e0:81:d5:07:18
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:19
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:1a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:1b
-      ip: 172.17.64.84
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d
+      interface: InfiniBand
+      ip: 172.18.64.84
+      ip6: fe80::202:c903:b:939d
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT26418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9e
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390086
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
index 9df2fe1ad4a5fe96e0787c107345fe9e1b649197..a06016761eff1604e9f7a0b83dcff85db73ffcea 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-85:
+  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: 
+  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:93:99
-      rate: 20000000000
-      ip6: fe80::202:c903:b:9399
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.85
-      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:93:9a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:ec
-      ip6: fe80::2e0:81ff:fed5:7ec
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.85
+      mac: 00:e0:81:d5:07:ec
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:ed
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:07:ee
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:ef
-      ip: 172.17.64.85
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390087
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
index 6a13b12f6b15a83895b366f539ac76c3f48534e7..cf00b3043c02088eb93037e0a07cbe57849c32ae 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-86:
+  architecture:
+    platform_type: x86_64
+    smp_size: 1
+    smt_size: 4
   bios:
-    version: V7.04
     release_date: 02/10/2011
     vendor: American Megatrends Inc.
+    version: V7.04
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  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:93:a1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:93a1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.86
-      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:93:a2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:0c
-      ip6: fe80::2e0:81ff:fed5:80c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.86
+      mac: 00:e0:81:d5:08:0c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:0d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:0e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:0f
-      ip: 172.17.64.86
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390088
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
index a5052b78bfb2a300ef13220b4a545d3f815ff167..4ad1de8d654585c2be33bb725a0cfe44d98672ff 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-87:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.87
+      mac: 00:e0:81:d5:07:58
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:59
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:5a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.87
       ip6: fe80::202:c903:b:93ad
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.87
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ae
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:58
-      ip6: fe80::2e0:81ff:fed5:758
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.87
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:5a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:5b
-      ip: 172.17.64.87
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390089
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
index 8bd0b85b879714a391049c81f1e1599bf8677c84..41b5e874231e519a02158ae6a5d0f9afa3ab81bc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-88:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.88
+      mac: 00:e0:81:d5:08:60
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:61
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:62
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.88
       ip6: fe80::202:c903:b:93b1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.88
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:60
-      ip6: fe80::2e0:81ff:fed5:860
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.88
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:62
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:63
-      ip: 172.17.64.88
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390090
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
index 235e947c28992518886e23db0260274bf6cf1ac4..50dd6d21653a56c97fd927a5178b220148981ce8 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-89:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.89
+      mac: 00:e0:81:d5:08:98
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:99
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:9a
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.89
       ip6: fe80::202:c903:b:5ced
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.89
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ee
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:98
-      ip6: fe80::2e0:81ff:fed5:898
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.89
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:99
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:9a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:9b
-      ip: 172.17.64.89
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390091
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
index a8fa3d6cf37154bdb0908925b855108210b5bdbd..ca4abe59847456e601b95cfc015605d11a3e1c96 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-9:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.9
+      mac: 00:e0:81:d5:08:84
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:85
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:86
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.9
       ip6: fe80::202:c903:b:9169
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.9
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:84
-      ip6: fe80::2e0:81ff:fed5:884
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.9
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:85
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:86
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:87
-      ip: 172.17.64.9
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390011
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
index b8b8458479ef62882394b02895b7066f6be5afd7..b243b6e66a162cc350bc5704210747f4175d482d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-90:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.90
+      mac: 00:e0:81:d5:06:64
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:65
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:66
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.90
       ip6: fe80::202:c903:b:5d09
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.90
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:64
-      ip6: fe80::2e0:81ff:fed5:664
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.90
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:65
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:66
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:67
-      ip: 172.17.64.90
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390092
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
index 6284d1611ceecd6a5b38e011059a2182925f1bbe..6c6c6b6c30a163b62123d1cbbb128e827e8e191a 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-91:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.91
+      mac: 00:e0:81:d5:06:dc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:dd
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:de
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.91
       ip6: fe80::202:c903:b:5cd1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.91
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:dc
-      ip6: fe80::2e0:81ff:fed5:6dc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.91
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:de
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:df
-      ip: 172.17.64.91
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390093
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
index 094edc8a0ebeaa71e68e4000c6322f9356a41b31..4eda1e103faa13f6c533a1b4bbbb06ad9e27b4e9 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-92:
+  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
-      device: sda
-      size: 320072933376
-      rev: A3EA
-      vendor: Hitachi
+    version: V7.01e
+  chassis:
+    manufacturer: TYAN
+    name: S5501
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.92
+      mac: 00:e0:81:d5:07:a4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:a5
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:07:a6
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.92
       ip6: fe80::202:c903:b:5ce5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.92
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:07:a4
-      ip6: fe80::2e0:81ff:fed5:7a4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.92
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:07:a5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:07:a6
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:07:a7
-      ip: 172.17.64.92
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390094
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
index 52d7c00c59d93112b336bfb840d041ad56e01da0..cfd89be0a1df91fb9725bf14f1d1682f56573683 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-93:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.93
+      mac: 00:e0:81:d5:06:4c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:4d
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:06:4e
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.93
       ip6: fe80::202:c903:b:5ead
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.93
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ae
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:4c
-      ip6: fe80::2e0:81ff:fed5:64c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.93
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:06:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:06:4e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:4f
-      ip: 172.17.64.93
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      rate: 10000000000
+      version: MT26418
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390095
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
index 641582cb487747bfb3d3dd2bc845201120a2c7f4..90fc04b5ea61cd099bf0178342c5a03fc36e49fc 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-95:
+  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: 
+  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:95
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5e95
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.95
-      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:96
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:06:c0
-      ip6: fe80::2e0:81ff:fed5:6c0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.95
+      mac: 00:e0:81:d5:06:c0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:06:c1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:06:c2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:06:c3
-      ip: 172.17.64.95
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      size: 320072933376
   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: 1009390097
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
index 5c6fda37d4b8a6ff55668265b68444407ec239a5..e02c6403361a76208d5df0c72ee6ad22b9d62bad 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.yaml
@@ -1,94 +1,65 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-97:
+  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
-      device: sda
-      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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    ib0:
+    eth0:
+      driver: e1000e
+      interface: Ethernet
+      ip: 172.16.64.97
+      mac: 00:e0:81:d5:08:00
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:01
+      management: false
+      mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
+      mac: 00:e0:81:d5:08:02
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.64.97
       ip6: fe80::202:c903:b:5ed5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT26418
-      ip: 172.18.64.97
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:00
-      ip6: fe80::2e0:81ff:fed5:800
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: e1000e
-      mountable: true
-      ip: 172.16.64.97
-    eth1:
       mounted: false
-      rate: 100000000
-      mac: 00:e0:81:d5:08:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
-      mounted: false
-      mac: 00:e0:81:d5:08:02
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:03
-      ip: 172.17.64.97
+      rate: 10000000000
+      version: MT26418
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A3EA
+      size: 320072933376
   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: 1009390099
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
index 471e767029dfd843f4dd98d5cccc0e5c9ee90a97..bb0e95004efb1cfbd653ea3ee2a9e5d2af61eb9d 100644
--- a/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.yaml
@@ -1,94 +1,47 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphene-99:
+  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: 
+  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:b1
-      rate: 20000000000
-      ip6: fe80::202:c903:b:5eb1
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT26418
-      ip: 172.18.64.99
-      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:b2
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT26418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:e0:81:d5:08:d4
-      ip6: fe80::2e0:81ff:fed5:8d4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: e1000e
-      mountable: true
+      interface: Ethernet
       ip: 172.16.64.99
+      mac: 00:e0:81:d5:08:d4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      rate: 100000000
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:d5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    eth2:
       mounted: false
+      rate: 100000000
+    eth2:
+      driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:d5:08:d6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: e1000e
-      mountable: false
-    bmc:
-      mac: 00:e0:81:d5:08:d7
-      ip: 172.17.64.99
-  operating_system:
-    kernel: 3.16.0-4-amd64
-    name: debian
-    version: "8.2"
+      mounted: false
   storage_devices:
     sda:
-      model: Hitachi HDS72103
       device: sda
-      size: 320072933376
+      model: Hitachi HDS72103
       rev: A3EA
-      vendor: Hitachi
+      size: 320072933376
   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: 1009390101
-    manufacturer: TYAN
-    name: S5501
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_diff.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6e7abcf7b8159dad5ca515fce237b8d27d203405
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_diff.yaml
@@ -0,0 +1,46 @@
+---
+nodes:
+  graphique-[-]:
+    network_adapters:
+      eth0:
+        enabled: false
+        mountable: false
+        rate: 10000000000
+      eth1:
+        enabled: false
+        mountable: false
+        rate: 10000000000
+      eth2:
+        mountable: true
+      eth3:
+        enabled: false
+        mountable: false
+        rate: 1000000000
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 15728640
+      clock_speed: 3200000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
+      vendor: Intel
+      version: E5-2620 v3
+
+  graphique-1:
+    chassis:
+      serial: BYGMJ32
+    network_adapters:
+      bmc:
+        ip: 172.17.67.1
+        mac: b0:83:fe:e4:69:d8
+  graphique-5:
+    chassis:
+      serial: BXTRV42
+    network_adapters:
+      bmc:
+        ip: 172.17.67.5
+        mac: 18:fb:7b:9b:91:d3
+      eth2:
+        enabled: true
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
index 2a87cf5c0a2696d64194aacdb8c8564e0247c807..db16b24308f25c18adf7c7c77d8d4c1e37f2e7dd 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -1,75 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphique-1:
-  supported_job_types:
-    virtual: ivt
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
   bios:
+    release_date: 08/28/2014
     vendor: Dell Inc.
     version: 1.0
-    release_date: 08/28/2014
-  storage_devices:
-    sda:
-      device: sda
-      size: 299439751168
-      model: PERC H330
-      rev: 4.24
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
   chassis:
-    serial: BYGMJ32
     manufacturer: Dell Inc.
     name: PowerEdge R730
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
+    serial: BYGMJ32
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
     eth0:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: b0:83:fe:e5:c0:54
-      rate: 10000000000
-      mounted: false
-      mountable: false
       management: false
-      enabled: false
+      mounted: false
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: b0:83:fe:e5:c0:56
-      rate: 10000000000
-      mounted: false
-      mountable: false
       management: false
-      enabled: false
+      mounted: false
     eth2:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.67.1
-      driver: bnx2x
       mac: b0:83:fe:e5:c0:58
-      rate: 1000000000
-      mounted: true
-      mountable: true
       management: false
+      mounted: true
+      rate: 1000000000
     eth3:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: b0:83:fe:e5:c0:5a
-      mounted: false
-      mountable: false
       management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.1
-      mac: b0:83:fe:e4:69:d8
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC H330
+      rev: 4.24
+      size: 299439751168
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
index 4c1682e39c9f9a18dbaa5d29156b2a25453dbc4a..4c1beda755690a17da4a19c02a6161cfbf254499 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -1,76 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphique-5:
-  supported_job_types:
-    virtual: ivt
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 12
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R730
+    serial: BXTRV42
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
     eth0:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 44:a8:42:0a:4b:9b
-      rate: 10000000000
-      mounted: false
-      mountable: false
       management: false
-      enabled: false
+      mounted: false
     eth1:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 44:a8:42:0a:4b:9d
-      rate: 10000000000
-      mounted: false
-      enabled: false
-      mountable: false
       management: false
+      mounted: false
     eth2:
+      driver: bnx2x
       interface: Ethernet
       ip: 172.16.67.5
-      driver: bnx2x
       mac: 44:a8:42:0a:4b:9f
-      rate: 1000000000
-      mounted: true
-      mountable: true
       management: false
-      enabled: true
+      mounted: true
+      rate: 1000000000
     eth3:
-      interface: Ethernet
       driver: bnx2x
+      interface: Ethernet
       mac: 44:a8:42:0a:4b:a1
-      mounted: false
-      mountable: false
       management: false
-      enabled: false
-      rate: 1000000000
-    bmc:
-      ip: 172.17.67.5
-      mac: 18:fb:7b:9b:91:d3
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2620 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-  architecture:
-    smp_size: 2
-    smt_size: 12
-    platform_type: x86_64
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 299439751168
       model: PERC H330
       rev: 4.24
-  chassis:
-    serial: BXTRV42
-    manufacturer: Dell Inc.
-    name: PowerEdge R730
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
+      size: 299439751168
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_diff.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9cfc2a3fae683e2dea35a931bc24cd932bd49abb
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_diff.yaml
@@ -0,0 +1,82 @@
+---
+nodes:
+  graphite-[-]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        mountable: false
+      eth3:
+        enabled: false
+        mountable: 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: 20971520
+      clock_speed: 2800000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
+      vendor: Intel
+      version: E5-2650
+
+  graphite-1:
+    chassis:
+      serial: 27Q7NZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.68.1
+        mac: f0:1f:af:e1:9a:0c
+    storage_devices:
+      sda:
+        timeread: 959
+        timewrite: 2205
+  graphite-2:
+    chassis:
+      serial: B6Q7NZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.68.2
+        mac: f0:1f:af:e1:97:56
+    storage_devices:
+      sda:
+        timeread: 956
+        timewrite: 1991
+  graphite-3:
+    chassis:
+      serial: G5Q7NZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.68.3
+        mac: f0:1f:af:df:5b:9c
+      ib0:
+        enabled: true
+        mountable: true
+    storage_devices:
+      sda:
+        timeread: 958
+        timewrite: 2963
+  graphite-4:
+    chassis:
+      serial: 66Q7NZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.68.4
+        mac: f0:1f:af:e0:3e:7f
+      ib0:
+        enabled: true
+        mountable: true
+    storage_devices:
+      sda:
+        timeread: 978
+        timewrite: 3300
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
index 59d944cc3a433ae425a4c48566297063fb8cbabb..76a43fef26f65eea12ba7f6d5a67a2889248e79a 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -1,92 +1,66 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphite-1:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 01/28/2015
     vendor: Dell Inc.
     version: 2.5
-    release_date: 01/28/2015
   chassis:
-    serial: 27Q7NZ1
     manufacturer: Dell Inc.
     name: PowerEdge R720
-  storage_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 959
-      timewrite: 2205
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
+    serial: 27Q7NZ1
   main_memory:
     ram_size: 270582939648
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:12:6c
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.68.1
-      driver: ixgbe
       mac: b8:ca:3a:69:12:68
-      rate: 10000000000
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: b8:ca:3a:69:12:6a
       management: false
-      mountable: true
-      enabled: true
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: b8:ca:3a:69:12:6c
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: b8:ca:3a:69:12:6d
-      mounted: false
       management: false
-      mountable: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:12:6a
       mounted: false
-      management: false
-      mountable: false
-      enabled: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:d1
+      interface: InfiniBand
+      ip: 172.16.68.9
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      mounted: true
-      management: false
-    bmc:
-      ip: 172.17.68.1
-      mac: f0:1f:af:e1:9a:0c
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+    sdb:
+      device: sdb
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
index 38ebd8dff827a7d1c3f9c9f6fcbe1f6e09b0891a..6c370eb0f1dbe1181b0cad62db5c2aa8ad922636 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -1,92 +1,66 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphite-2:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 01/28/2015
     vendor: Dell Inc.
     version: 2.5
-    release_date: 01/28/2015
   chassis:
-    serial: B6Q7NZ1
     manufacturer: Dell Inc.
     name: PowerEdge R720
-  storage_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 956
-      timewrite: 1991
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
+    serial: B6Q7NZ1
   main_memory:
     ram_size: 270582939648
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:1e:8c
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.68.2
-      driver: ixgbe
       mac: b8:ca:3a:69:1e:88
-      rate: 10000000000
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: b8:ca:3a:69:1e:8a
       management: false
-      mountable: true
-      enabled: true
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: b8:ca:3a:69:1e:8c
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: b8:ca:3a:69:1e:8d
-      mounted: false
       management: false
-      mountable: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:1e:8a
       mounted: false
-      management: false
-      mountable: false
-      enabled: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:11
+      interface: InfiniBand
+      ip: 172.16.68.10
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      mounted: true
-      management: false
-    bmc:
-      ip: 172.17.68.2
-      mac: f0:1f:af:e1:97:56
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+    sdb:
+      device: sdb
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
index e8b11160f939b61155037b8147f310abbb14d373..0043516b427a3528d458688a44a8cd2b7f690103 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -1,94 +1,66 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphite-3:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 01/28/2015
     vendor: Dell Inc.
     version: 2.5
-    release_date: 01/28/2015
   chassis:
-    serial: G5Q7NZ1
     manufacturer: Dell Inc.
     name: PowerEdge R720
-  storage_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 958
-      timewrite: 2963
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
+    serial: G5Q7NZ1
   main_memory:
     ram_size: 270582939648
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:11:dc
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: b8:ca:3a:69:11:dd
-      mounted: false
-      management: false
-      mountable: false
-      enabled: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.68.3
-      driver: ixgbe
       mac: b8:ca:3a:69:11:d8
-      rate: 10000000000
-      mounted: true
       management: false
-      mountable: true
-      enabled: true
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: b8:ca:3a:69:11:da
+      management: false
+      mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: b8:ca:3a:69:11:dc
+      management: false
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: b8:ca:3a:69:11:dd
       management: false
-      mountable: false
-      enabled: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:e1
+      interface: InfiniBand
+      ip: 172.16.68.11
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    bmc:
-      ip: 172.17.68.3
-      mac: f0:1f:af:df:5b:9c
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+    sdb:
+      device: sdb
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
index b9a1e6d032ea6197ba5d953f9a546e71c6885e65..48489614d7b1457fa372af1f9855c7de8250b636 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -1,94 +1,66 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 graphite-4:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 01/28/2015
     vendor: Dell Inc.
     version: 2.5
-    release_date: 01/28/2015
   chassis:
-    serial: 66Q7NZ1
     manufacturer: Dell Inc.
     name: PowerEdge R720
-  storage_devices:
-    sda:
-      device: sda
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-      timeread: 978
-      timewrite: 3300
-    sdb:
-      device: sdb
-      size: 300069052416
-      model: INTEL SSDSC2BB30
-      rev: DL10
-  supported_job_types:
-    virtual: ivt
+    serial: 66Q7NZ1
   main_memory:
     ram_size: 270582939648
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.68.4
-      driver: ixgbe
       mac: b8:ca:3a:69:12:40
-      rate: 10000000000
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: b8:ca:3a:69:12:42
       management: false
-      mountable: true
-      enabled: true
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: b8:ca:3a:69:12:44
-      mounted: false
       management: false
-      mountable: false
-      enabled: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: b8:ca:3a:69:12:45
-      mounted: false
       management: false
-      mountable: false
-      enabled: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: b8:ca:3a:69:12:42
       mounted: false
-      management: false
-      mountable: false
-      enabled: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:f4:52:14:03:00:76:f2:c1
+      interface: InfiniBand
+      ip: 172.16.68.12
+      management: false
+      mounted: true
       rate: 56000000000
       version: MT4099
-      mounted: true
-      management: false
-      mountable: true
-      enabled: true
-    bmc:
-      ip: 172.17.68.4
-      mac: f0:1f:af:e0:3e:7f
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 2800000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2650
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2650 0 @ 2.00GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+    sdb:
+      device: sdb
+      model: INTEL SSDSC2BB30
+      rev: DL10
+      size: 300069052416
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/griffon_diff.yaml b/input/grid5000/sites/nancy/clusters/griffon/griffon_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..67354267170617eac739d93a086a57225e3939b4
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/griffon/griffon_diff.yaml
@@ -0,0 +1,361 @@
+---
+nodes:
+  griffon-[1-92]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      ib0:
+        driver: mlx4_core
+        enabled: false
+        interface: InfiniBand
+        management: false
+        mountable: false
+        mounted: false
+        rate: 10000000000
+        version: MT26418
+      ib1:
+        driver: mlx4_core
+        enabled: false
+        interface: InfiniBand
+        management: false
+        mountable: false
+        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           L5420  @ 2.50GHz
+      vendor: Intel
+      version: L5420
+    storage_devices:
+      sda:
+        vendor: Hitachi
+
+  griffon-1:
+    chassis:
+      serial: 812530006
+    network_adapters:
+      bmc:
+        ip: 172.17.65.1
+        mac: 00:e0:81:4f:e3:13
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c188
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1
+        ip6: fe80::202:c903:3:18f1
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f2
+  griffon-11:
+    chassis:
+      serial: 812530016
+    network_adapters:
+      bmc:
+        ip: 172.17.65.11
+        mac: 00:e0:81:4f:e3:70
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c24c
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9
+        ip: 172.18.65.11
+        ip6: fe80::202:c903:2:80d9
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:da
+  griffon-12:
+    chassis:
+      serial: 812530017
+    network_adapters:
+      bmc:
+        ip: 172.17.65.12
+        mac: 00:e0:81:4f:ca:8b
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c19e
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd
+        ip: 172.18.65.12
+        ip6: fe80::202:c903:2:80dd
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:de
+  griffon-14:
+    chassis:
+      serial: 812530019
+    network_adapters:
+      bmc:
+        ip: 172.17.65.14
+        mac: 00:e0:81:4f:e2:c5
+      eth0:
+        ip6: fe80::2e0:81ff:feb1:c060
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd
+        ip: 172.18.65.14
+        ip6: fe80::202:c903:2:80cd
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ce
+  griffon-15:
+    chassis:
+      serial: 812530020
+    network_adapters:
+      bmc:
+        ip: 172.17.65.15
+        mac: 00:e0:81:4f:e3:87
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c4c4
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5
+        ip: 172.18.65.15
+        ip6: fe80::202:c903:2:80b5
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b6
+  griffon-17:
+    chassis:
+      serial: 812530022
+    network_adapters:
+      bmc:
+        ip: 172.17.65.17
+        mac: 00:e0:81:4f:e3:6a
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c218
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17
+        ip: 172.18.65.17
+        ip6: fe80::202:c903:3:3017
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:18
+  griffon-18:
+    chassis:
+      serial: 812530023
+    network_adapters:
+      bmc:
+        ip: 172.17.65.18
+        mac: 00:e0:81:4f:cb:0e
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c204
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b
+        ip: 172.18.65.18
+        ip6: fe80::202:c903:3:302b
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2c
+  griffon-19:
+    chassis:
+      serial: 812530024
+    network_adapters:
+      bmc:
+        ip: 172.17.65.19
+        mac: 00:e0:81:4f:e3:00
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c560
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37
+        ip: 172.18.65.19
+        ip6: fe80::202:c903:3:3037
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:38
+  griffon-2:
+    chassis:
+      serial: 812530007
+    network_adapters:
+      bmc:
+        ip: 172.17.65.2
+        mac: 00:e0:81:4f:e2:fc
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c4bc
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65
+        ip: 172.18.65.2
+        ip6: fe80::202:c903:2:8065
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:66
+  griffon-22:
+    chassis:
+      serial: 812530027
+    network_adapters:
+      bmc:
+        ip: 172.17.65.22
+        mac: 00:e0:81:4f:cb:02
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:bfa6
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33
+        ip: 172.18.65.22
+        ip6: fe80::202:c903:3:3033
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:34
+  griffon-23:
+    chassis:
+      serial: 812530028
+    network_adapters:
+      bmc:
+        ip: 172.17.65.23
+        mac: 00:e0:81:4f:ca:7e
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c156
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f
+        ip: 172.18.65.23
+        ip6: fe80::202:c903:3:302f
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:30
+  griffon-25:
+    chassis:
+      serial: 812530030
+    network_adapters:
+      bmc:
+        ip: 172.17.65.25
+        mac: 00:e0:81:4f:e3:ba
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:bfe2
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23
+        ip: 172.18.65.25
+        ip6: fe80::202:c903:3:3023
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:24
+  griffon-29:
+    chassis:
+      serial: 812530034
+    network_adapters:
+      bmc:
+        ip: 172.17.65.29
+        mac: 00:e0:81:4f:e3:71
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c4ac
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43
+        ip: 172.18.65.29
+        ip6: fe80::202:c903:3:3043
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:44
+  griffon-4:
+    chassis:
+      serial: 812530009
+    network_adapters:
+      bmc:
+        ip: 172.17.65.4
+        mac: 00:e0:81:4f:e3:7a
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:bfe4
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69
+        ip: 172.18.65.4
+        ip6: fe80::202:c903:2:8069
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:6a
+  griffon-5:
+    chassis:
+      serial: 812530010
+    network_adapters:
+      bmc:
+        ip: 172.17.65.5
+        mac: 00:e0:81:4f:e3:8d
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c1fc
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1
+        ip: 172.18.65.5
+        ip6: fe80::202:c903:2:80c1
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c2
+  griffon-58:
+    chassis:
+      serial: 812530063
+    network_adapters:
+      bmc:
+        ip: 172.17.65.58
+        mac: 00:e0:81:4f:e2:f3
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c4ac
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d
+        ip: 172.18.65.58
+        ip6: fe80::202:c903:3:179d
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9e
+  griffon-59:
+    chassis:
+      serial: 812530064
+    network_adapters:
+      bmc:
+        ip: 172.17.65.59
+        mac: 00:e0:81:4f:e3:05
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c1f8
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31
+        ip: 172.18.65.59
+        ip6: fe80::202:c903:3:1731
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:32
+  griffon-60:
+    chassis:
+      serial: 812530065
+    network_adapters:
+      bmc:
+        ip: 172.17.65.60
+        mac: 00:e0:81:4f:e3:90
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:bff4
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41
+        ip: 172.18.65.60
+        ip6: fe80::202:c903:3:1741
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:42
+  griffon-7:
+    chassis:
+      serial: 812530012
+    network_adapters:
+      bmc:
+        ip: 172.17.65.7
+        mac: 00:e0:81:4f:ca:90
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c4ac
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55
+        ip: 172.18.65.7
+        ip6: fe80::202:c903:2:8055
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:56
+  griffon-8:
+    chassis:
+      serial: 812530013
+    network_adapters:
+      bmc:
+        ip: 172.17.65.8
+        mac: 00:e0:81:4f:e3:c2
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c4a0
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9
+        ip: 172.18.65.8
+        ip6: fe80::202:c903:2:80c9
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ca
+  griffon-9:
+    chassis:
+      serial: 812530014
+    network_adapters:
+      bmc:
+        ip: 172.17.65.9
+        mac: 00:e0:81:4f:e2:fe
+      eth0:
+        ip6: fe80::2e0:81ff:feb2:c576
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d
+        ip: 172.18.65.9
+        ip6: fe80::202:c903:2:805d
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5e
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
index e42d352708de6bbbba40596898cb98170d084f60..212bc412dac071b242067c2d1d57c3380cbe5c95 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-1:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.1
-      mac: 00:e0:81:4f:e3:13
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.1
-      ip6: fe80::2e0:81ff:feb2:c188
-      driver: e1000e
       mac: 00:e0:81:b2:c1:88
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c1:89
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.1
-      ip6: fe80::202:c903:3:18f1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:18:f2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  supported_job_types:
-    virtual: ivt
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial: 812530006
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
index 6cb83aac1afc8ca23f5858725848c3cd046d038c..5d13b0343f8c9422bec06b5d1eec1b44628d4219 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-11:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
   main_memory:
     ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.11
-      mac: 00:e0:81:4f:e3:70
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.11
-      ip6: fe80::2e0:81ff:feb2:c24c
-      driver: e1000e
       mac: 00:e0:81:b2:c2:4c
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c2:4d
-      enabled: true
-      mountable: true
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.11
-      ip6: fe80::202:c903:2:80d9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:da
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial: 812530016
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
index 4d0ba27429c1e7fe539db2c64736c5a9ee87afe7..c97a5515328a2a32a55406efc9aee9b15d641ce8 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-12:
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
   main_memory:
     ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.12
-      mac: 00:e0:81:4f:ca:8b
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.12
-      ip6: fe80::2e0:81ff:feb2:c19e
-      driver: e1000e
       mac: 00:e0:81:b2:c1:9e
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c1:9f
-      enabled: true
-      mountable: true
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.12
-      ip6: fe80::202:c903:2:80dd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:de
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  chassis:
-    serial: 812530017
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
index 9efde97d83d60b8fb3adfe1232de792ed9d580ef..18fdad5d7dec167786ebc799affe878e9b7e5c97 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-14:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
+  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
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.14
-      mac: 00:e0:81:4f:e2:c5
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.14
-      ip6: fe80::2e0:81ff:feb1:c060
-      driver: e1000e
       mac: 00:e0:81:b1:c0:60
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b1:c0:61
-      enabled: true
-      mountable: true
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.14
-      ip6: fe80::202:c903:2:80cd
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:ce
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  chassis:
-    serial: 812530019
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
index 8da552d6da38e712f57b8e28d37a192140460437..473b6c6e3d4f0220b4dfa95c0bd65b19fd89323b 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-15:
-  supported_job_types:
-    virtual: ivt
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
   bios:
+    release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
     version: V1.05
-    release_date: 08/21/2009
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.15
-      ip6: fe80::2e0:81ff:feb2:c4c4
-      driver: e1000e
       mac: 00:e0:81:b2:c4:c4
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c4:c5
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.15
-      ip6: fe80::202:c903:2:80b5
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:b6
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.15
-      mac: 00:e0:81:4f:e3:87
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial: 812530020
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
index 114a27121c8f9ba14b13157135425c4b167521ce..3b0632250c62cec4429058a441199d8b8d02c2e1 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-17:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.17
-      mac: 00:e0:81:4f:e3:6a
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.17
-      ip6: fe80::2e0:81ff:feb2:c218
-      driver: e1000e
       mac: 00:e0:81:b2:c2:18
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c2:19
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.17
-      ip6: fe80::202:c903:3:3017
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:18
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial: 812530022
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
index 6c48330fe971c12dd8f3fc71c0f8651afcc07e6e..45b93161865b4ce50f753df6e0320c51d26fb987 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-18:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
+  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: 
   main_memory:
     ram_size: 17179869184
   network_adapters:
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.18
-      ip6: fe80::2e0:81ff:feb2:c204
-      driver: e1000e
       mac: 00:e0:81:b2:c2:04
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c2:05
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.18
-      ip6: fe80::202:c903:3:302b
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:2c
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.18
-      mac: 00:e0:81:4f:cb:0e
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial: 812530023
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
index dda54b1b10baa3df7e5fdb02babfca1ccfed81cb..d36b4030eca5310e5f6a4e1940ff916b3f1f49da 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-19:
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.19
-      mac: 00:e0:81:4f:e3:00
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.19
-      ip6: fe80::2e0:81ff:feb2:c560
-      driver: e1000e
       mac: 00:e0:81:b2:c5:60
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c5:61
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.19
-      ip6: fe80::202:c903:3:3037
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:38
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
+      size: 320072933376
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 812530024
-    manufacturer: TYAN Computer Corporation
-    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
index 78648904967463db11eae9ba8709195c7d55adc5..c9a9d6fbecaa4b184fda7ee573f2f769bcf2ce63 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-2:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
   bios:
+    release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
     version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
   main_memory:
     ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  supported_job_types:
-    virtual: ivt
   network_adapters:
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.2
-      ip6: fe80::2e0:81ff:feb2:c4bc
-      driver: e1000e
       mac: 00:e0:81:b2:c4:bc
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c4:bd
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.2
-      ip6: fe80::202:c903:2:8065
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:66
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.2
-      mac: 00:e0:81:4f:e2:fc
-  chassis:
-    serial: 812530007
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
index 8295bd827e840a2322e18c94878885da41910079..8e39f8db65dc898eb1c8d107194c4317f75c5ff6 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-22:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
   main_memory:
     ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.22
-      mac: 00:e0:81:4f:cb:02
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.22
-      ip6: fe80::2e0:81ff:feb2:bfa6
-      driver: e1000e
       mac: 00:e0:81:b2:bf:a6
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:bf:a7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.22
-      ip6: fe80::202:c903:3:3033
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:34
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial: 812530027
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
index 34f6d7e79905b5332a059fc3ca2afcee483af04e..fa8505e00d8e4dad270119f41973531c73f2888e 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-23:
-  storage_devices:
-    sda:
-      device: 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
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.23
-      mac: 00:e0:81:4f:ca:7e
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.23
-      ip6: fe80::2e0:81ff:feb2:c156
-      driver: e1000e
       mac: 00:e0:81:b2:c1:56
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c1:57
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.23
-      ip6: fe80::202:c903:3:302f
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:30
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
   supported_job_types:
     virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial: 812530028
-    manufacturer: TYAN Computer Corporation
-    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
index 46a1c1464aa55ec61643d90f3a964e8b52f692b7..0b6c88885d5e1d23f8710318466a82959a42d31f 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-25:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.25
-      mac: 00:e0:81:4f:e3:ba
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.25
-      ip6: fe80::2e0:81ff:feb2:bfe2
-      driver: e1000e
       mac: 00:e0:81:b2:bf:e2
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:bf:e3
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.25
-      ip6: fe80::202:c903:3:3023
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:24
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  main_memory:
-    ram_size: 17179869184
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial: 812530030
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
index a63e4299ea4d6b10ae0c45c85cc2d7febffd425f..bef773096ab78a678e05202172e2fd907bd010b0 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-29:
+  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: 
   main_memory:
     ram_size: 17179869184
-  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
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
   network_adapters:
-    bmc:
-      ip: 172.17.65.29
-      mac: 00:e0:81:4f:e3:71
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.29
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
       mac: 00:e0:81:b2:c4:b0
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c4:b1
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.29
-      ip6: fe80::202:c903:3:3043
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:44
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial: 812530034
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
index b69d371a53551642327066d22c1c10e4a0fdda13..5fc7bb8ff8ce2f30ab568649f66843a661bc10b4 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-4:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.4
-      mac: 00:e0:81:4f:e3:7a
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.4
-      ip6: fe80::2e0:81ff:feb2:bfe4
-      driver: e1000e
       mac: 00:e0:81:b2:bf:e4
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:bf:e5
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.4
-      ip6: fe80::202:c903:2:8069
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:6a
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial: 812530009
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
index a0e7a96ba5f61195d23143ea10e4496861a8a5ba..6b9b140fec6dea4cb416d986a4ecaa051edf4c44 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-5:
+  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.5
-      mac: 00:e0:81:4f:e3:8d
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.5
-      ip6: fe80::2e0:81ff:feb2:c1fc
-      driver: e1000e
       mac: 00:e0:81:b2:c1:fc
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c1:fd
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.5
-      ip6: fe80::202:c903:2:80c1
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:c2
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  chassis:
-    serial: 812530010
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
index 085fd75a4b8313c6674b265f4f3e018103ef64ed..b16fbf33c9230065052b3be21f014fbf0c4c0756 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-58:
+  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: 
   main_memory:
     ram_size: 17179869184
-  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
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
   network_adapters:
-    bmc:
-      ip: 172.17.65.58
-      mac: 00:e0:81:4f:e2:f3
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.58
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
       mac: 00:e0:81:b2:c0:28
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c0:29
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.58
-      ip6: fe80::202:c903:3:179d 
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:17:9e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial: 812530063
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
index 51be9011b8d7a3ce154445ef4c564da60d6f25cb..b645b03bc40d742adac2e23fb4b4c00f8a264320 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-59:
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
+  bios:
+    release_date: 08/21/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
   main_memory:
     ram_size: 17179869184
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  supported_job_types:
-    virtual: ivt
   network_adapters:
-    bmc:
-      ip: 172.17.65.59
-      mac: 00:e0:81:4f:e3:05
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.59
-      ip6: fe80::2e0:81ff:feb2:c1f8
-      driver: e1000e
       mac: 00:e0:81:b2:c1:f8
-      rate: 1000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c1:f9
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.59
-      ip6: fe80::202:c903:3:1731
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:17:32
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  chassis:
-    serial: 812530064
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
index b1c4aeaa60747652af171cff6e663f72686ead11..49086941cd97fa34f96fbc05493d9472dcc1a9c5 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-60:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
   bios:
+    release_date: 08/21/2009
     vendor: Phoenix Technologies LTD
     version: V1.05
-    release_date: 08/21/2009
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.60
-      ip6: fe80::2e0:81ff:feb2:bff4
-      driver: e1000e
       mac: 00:e0:81:b2:bf:f4
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:bf:f5
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.60
-      ip6: fe80::202:c903:3:1741
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:17:42
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.65.60
-      mac: 00:e0:81:4f:e3:90
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 812530065
-    manufacturer: TYAN Computer Corporation
-    name: S5393
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
index 99f551e0b8a3c9737b881e2fd084e00fbcd966dd..bb268ee34452640a69ac8cd4a7a1a8445d6d4922 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-7:
+  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: 
   main_memory:
     ram_size: 17179869184
-  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
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  supported_job_types:
-    virtual: ivt
   network_adapters:
-    bmc:
-      ip: 172.17.65.7
-      mac: 00:e0:81:4f:ca:90
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.7
-      ip6: fe80::2e0:81ff:feb2:c4ac
-      driver: e1000e
       mac: 00:e0:81:b2:c4:ac
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c4:ad
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.7
-      ip6: fe80::202:c903:2:8055
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:56
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  chassis:
-    serial: 812530012
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
index 9aa2e6f1991f36b2e3608306ad8b67b8c37cc71c..97eb68360533beae223c591691c4f7224260f971 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-8:
-  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: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.8
-      mac: 00:e0:81:4f:e3:c2
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.8
-      ip6: fe80::2e0:81ff:feb2:c4a0
-      driver: e1000e
       mac: 00:e0:81:b2:c4:a0
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c4:a1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.8
-      ip6: fe80::202:c903:2:80c9
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:ca
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
   storage_devices:
     sda:
       device: sda
-      size: 320072933376
       model: Hitachi HDP72503
       rev: A5CA
-      vendor: Hitachi
-  main_memory:
-    ram_size: 17179869184
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  chassis:
-    serial: 812530013
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
index 975f28186714804db669b38557143624b01d22dc..838d72a20ed4d9634f6afe9bd87a7c500f73d83d 100644
--- a/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.yaml
@@ -1,85 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 griffon-9:
-  main_memory:
-    ram_size: 17179869184
-  storage_devices:
-    sda:
-      device: sda
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      vendor: Hitachi
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
+  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
-  supported_job_types:
-    virtual: ivt
+  chassis:
+    manufacturer: TYAN Computer Corporation
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
-    bmc:
-      ip: 172.17.65.9
-      mac: 00:e0:81:4f:e2:fe
     eth0:
+      driver: e1000e
       interface: Ethernet
       ip: 172.16.65.9
-      ip6: fe80::2e0:81ff:feb2:c576
-      driver: e1000e
       mac: 00:e0:81:b2:c5:76
-      rate: 100000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      interface: Ethernet
       driver: e1000e
+      interface: Ethernet
       mac: 00:e0:81:b2:c5:77
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    ib0:
-      interface: InfiniBand
-      ip: 172.18.65.9
-      ip6: fe80::202:c903:2:805d
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d
-      rate: 10000000000
-      version: MT26418
-      enabled: 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:02:80:5e
-      rate: 10000000000
-      version: MT26418
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  architecture:
-    smp_size: 2
-    smt_size: 8
-    platform_type: x86_64
-  processor:
-    clock_speed: 2500000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: L5420
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU           L5420  @ 2.50GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 6291456
-    cache_l3: 0
-  chassis:
-    serial: 812530014
-    manufacturer: TYAN Computer Corporation
-    name: S5393
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_diff.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1e30a78f4c232ad3b0331ec40ae32d2eac480bc4
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_diff.yaml
@@ -0,0 +1,61 @@
+---
+nodes:
+  grimoire-[1-8]:
+    chassis:
+      serial: 3Z0ZH82
+    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: 20971520
+      clock_speed: 3200000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
+      vendor: Intel
+      version: E5-2630 v3
+
+  grimoire-2:
+    storage_devices:
+      sda:
+        timeread: 1289
+        timewrite: 2889
+  grimoire-3:
+    chassis:
+      serial: 3YZYH82
+    storage_devices:
+      sda:
+        timeread: 1256
+        timewrite: 2713
+  grimoire-5:
+    chassis:
+      serial: 36X1J82
+    storage_devices:
+      sda:
+        timeread: 1266
+        timewrite: 2907
+  grimoire-6:
+    chassis:
+      serial: 3722J82
+    storage_devices:
+      sda:
+        timeread: 1310
+        timewrite: 2993
+  grimoire-7:
+    chassis:
+      serial: 36Y3J82
+    storage_devices:
+      sda:
+        timeread: 1277
+        timewrite: 2927
+  grimoire-8:
+    chassis:
+      serial: 3703J82
+    storage_devices:
+      sda:
+        timeread: 1260
+        timewrite: 2870
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
index df7fd02f785f391a2e48d02650dbeed11aa42e50..0a0fb705252ceb72eff0da6f30a6635d0ee459d2 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -1,113 +1,97 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grimoire-2:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3Z0ZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 3Z0ZH82
+  main_memory:
+    ram_size: 135291469824
+  network_adapters:
+    eth0:
+      driver: ixgbe
+      interface: Ethernet
+      ip: 172.16.71.2
+      mac: 24:6e:96:03:24:78
+      management: false
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: 24:6e:96:03:24:7a
+      management: false
+      mounted: false
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:7f:34:c4
+      management: false
+      mounted: false
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:7f:34:c6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:24:7c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:24:7d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:31:51
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 56000000000
+      version: MT4099
   storage_devices:
     sda:
       device: sda
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
-      timeread: 1289
-      timewrite: 2889
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdc:
       device: sdc
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdd:
       device: sdd
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdf:
       device: sdf
-      size: 200049647616
       model: PX02SSF020
       rev: A4AF
+      size: 200049647616
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:7c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.2
-      driver: ixgbe
-      mac: 24:6e:96:03:24:78
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:24:7d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:24:7a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:c4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:34:c6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:31:51
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
index a77eb7e575f1fee4f3dc7052ea60af289a6a780e..1a6d82db981162f17198644a5a986585ff728e1c 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -1,113 +1,97 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grimoire-3:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3YZYH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 3YZYH82
+  main_memory:
+    ram_size: 135291469824
+  network_adapters:
+    eth0:
+      driver: ixgbe
+      interface: Ethernet
+      ip: 172.16.71.3
+      mac: 24:6e:96:03:20:f0
+      management: false
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: 24:6e:96:03:20:f2
+      management: false
+      mounted: false
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:7f:38:b4
+      management: false
+      mounted: false
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:7f:38:b6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:20:f4
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:20:f5
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:30:d1
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 56000000000
+      version: MT4099
   storage_devices:
     sda:
       device: sda
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
-      timeread: 1256
-      timewrite: 2713
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdc:
       device: sdc
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdd:
       device: sdd
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdf:
       device: sdf
-      size: 200049647616
       model: PX02SSF020
       rev: A4AF
+      size: 200049647616
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:20:f4
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.3
-      driver: ixgbe
-      mac: 24:6e:96:03:20:f0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:20:f5
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:03:20:f2
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:38:b4
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7f:38:b6
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:b9:30:d1
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
index a95417f4a3e70d62e6e3b4fa362c3f95a49a6090..c0929cf2bb78581ad8856622389f19b2e523fff5 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -1,113 +1,97 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grimoire-5:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 36X1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1266
-      timewrite: 2907
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
+    serial: 36X1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:96:94
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.71.5
-      driver: ixgbe
       mac: 24:6e:96:02:96:90
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:96:92
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:ac
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:96:95
       mounted: false
-      management: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:ae
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:96:94
       management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:96:95
+      management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:61
+      interface: InfiniBand
+      management: false
+      mounted: false
       rate: 56000000000
       version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdc:
+      device: sdc
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdd:
+      device: sdd
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sde:
+      device: sde
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AF
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
index 3cb42395230f0daa262d9dfb1c616d6a1bbb039e..9f90e0cbeef7d7ad5b7d63a180278de60aadfe5a 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -1,113 +1,97 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grimoire-6:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3722J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1310
-      timewrite: 2993
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
+    serial: 3722J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.71.6
-      driver: ixgbe
       mac: 24:6e:96:02:a3:88
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
-      mac: 24:6e:96:02:a3:8a
-      mounted: false
-      management: false
-    eth4:
       interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:8c
-      mounted: false
+      mac: 24:6e:96:02:a3:8a
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:8d
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:47:5c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:47:5e
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a3:8c
       management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a3:8d
+      management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:50:a1
+      interface: InfiniBand
+      management: false
+      mounted: false
       rate: 56000000000
       version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdc:
+      device: sdc
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdd:
+      device: sdd
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sde:
+      device: sde
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AF
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
index 45d31dcdfcd1f52ad564592e9b075ecb41c742cd..a76152d7e2419980d4d2295b09033f81897c5ab1 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -1,113 +1,97 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grimoire-7:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 36Y3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1277
-      timewrite: 2927
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sde:
-      device: sde
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-    sdf:
-      device: sdf
-      size: 200049647616
-      model: PX02SSF020
-      rev: A4AF
-  supported_job_types:
-    virtual: ivt
+    serial: 36Y3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:7c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.71.7
-      driver: ixgbe
       mac: 24:6e:96:02:a9:78
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a9:7a
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:7d
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:a4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:a6
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a9:7c
       management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a9:7d
+      management: false
+      mounted: false
     ib0:
-      interface: InfiniBand
       driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:51
+      interface: InfiniBand
+      management: false
+      mounted: false
       rate: 56000000000
       version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdc:
+      device: sdc
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdd:
+      device: sdd
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sde:
+      device: sde
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AF
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
index da6f1c4eb9a259afe538fbf4657c28002d5aa3ca..4cd2fa330c9c7e05402601ccafc60002e58cd295 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -1,113 +1,97 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grimoire-8:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3703J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 3703J82
+  main_memory:
+    ram_size: 135291469824
+  network_adapters:
+    eth0:
+      driver: ixgbe
+      interface: Ethernet
+      ip: 172.16.71.8
+      mac: 24:6e:96:02:a0:88
+      management: false
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: 24:6e:96:02:a0:8a
+      management: false
+      mounted: false
+    eth2:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:7e:4a:54
+      management: false
+      mounted: false
+    eth3:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:7e:4a:56
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a0:8c
+      management: false
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a0:8d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:31
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 56000000000
+      version: MT4099
   storage_devices:
     sda:
       device: sda
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
-      timeread: 1260
-      timewrite: 2870
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdc:
       device: sdc
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdd:
       device: sdd
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: ST600MM0088
       rev: TT31
+      size: 600127266816
     sdf:
       device: sdf
-      size: 200049647616
       model: PX02SSF020
       rev: A4AF
+      size: 200049647616
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 135291469824
-  network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:8c
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.71.8
-      driver: ixgbe
-      mac: 24:6e:96:02:a0:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:8d
-      mounted: false
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 24:6e:96:02:a0:8a
-      mounted: false
-      management: false
-    eth2:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:54
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:7e:4a:56
-      mounted: false
-      management: false
-    ib0:
-      interface: InfiniBand
-      driver: mlx4_core
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:e4:1d:2d:03:00:bf:52:31
-      rate: 56000000000
-      version: MT4099
-      mounted: false
-      management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_diff.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..42fd306d82b4f95cde416d21a81ac243c76fd449
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_diff.yaml
@@ -0,0 +1,363 @@
+---
+nodes:
+  grisou-[1-51]:
+    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: 20971520
+      clock_speed: 3200000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
+      vendor: Intel
+      version: E5-2630 v3
+
+
+  grisou-1:
+    chassis:
+      serial: 2ZY2J82
+    storage_devices:
+      sda:
+        timeread: 1289
+        timewrite: 3014
+  grisou-10:
+    chassis:
+      serial: 39G0J82
+    storage_devices:
+      sda:
+        timeread: 1254
+        timewrite: 2878
+  grisou-11:
+    chassis:
+      serial: 3970J82
+    storage_devices:
+      sda:
+        timeread: 1287
+        timewrite: 2977
+  grisou-12:
+    chassis:
+      serial: 39LZH82
+    storage_devices:
+      sda:
+        timeread: 1286
+        timewrite: 3209
+  grisou-13:
+    chassis:
+      serial: 39D4J82
+    storage_devices:
+      sda:
+        timeread: 1275
+        timewrite: 2923
+  grisou-14:
+    chassis:
+      serial: 3T72J82
+    storage_devices:
+      sda:
+        timeread: 1293
+        timewrite: 2777
+  grisou-15:
+    chassis:
+      serial: 3SZ1J82
+    storage_devices:
+      sda:
+        timeread: 1291
+        timewrite: 2913
+  grisou-16:
+    chassis:
+      serial: 2ZSZH82
+    storage_devices:
+      sda:
+        timeread: 1305
+        timewrite: 2796
+  grisou-17:
+    chassis:
+      serial: 2ZR2J82
+    storage_devices:
+      sda:
+        timeread: 1287
+        timewrite: 2920
+  grisou-18:
+    chassis:
+      serial: 2ZW3J82
+    storage_devices:
+      sda:
+        timeread: 1315
+        timewrite: 2938
+  grisou-19:
+    chassis:
+      serial: 39JZH82
+    storage_devices:
+      sda:
+        timeread: 1280
+        timewrite: 2896
+  grisou-2:
+    chassis:
+      serial: 3020J82
+    storage_devices:
+      sda:
+        timeread: 1251
+        timewrite: 2915
+  grisou-20:
+    chassis:
+      serial: 3933J82
+    storage_devices:
+      sda:
+        timeread: 1306
+        timewrite: 2934
+  grisou-21:
+    chassis:
+      serial: 39KZH82
+    storage_devices:
+      sda:
+        timeread: 1308
+        timewrite: 2885
+  grisou-22:
+    chassis:
+      serial: 3984J82
+    storage_devices:
+      sda:
+        timeread: 1305
+        timewrite: 2944
+  grisou-23:
+    chassis:
+      serial: 3T83J82
+    storage_devices:
+      sda:
+        timeread: 1290
+        timewrite: 2893
+  grisou-24:
+    chassis:
+      serial: 3T13J82
+    storage_devices:
+      sda:
+        timeread: 1293
+        timewrite: 2874
+  grisou-25:
+    chassis:
+      serial: 3SX0J82
+    storage_devices:
+      sda:
+        timeread: 1298
+        timewrite: 2914
+  grisou-26:
+    chassis:
+      serial: 3T24J82
+    storage_devices:
+      sda:
+        timeread: 1308
+        timewrite: 2957
+  grisou-27:
+    chassis:
+      serial: 3SY3J82
+    storage_devices:
+      sda:
+        timeread: 1296
+        timewrite: 2904
+  grisou-28:
+    chassis:
+      serial: 3T44J82
+    storage_devices:
+      sda:
+        timeread: 1287
+        timewrite: 2907
+  grisou-29:
+    chassis:
+      serial: 3T33J82
+    storage_devices:
+      sda:
+        timeread: 1306
+        timewrite: 2978
+  grisou-3:
+    chassis:
+      serial: 2ZZ1J82
+    storage_devices:
+      sda:
+        timeread: 1273
+        timewrite: 2953
+  grisou-30:
+    chassis:
+      serial: 3T04J82
+    storage_devices:
+      sda:
+        timeread: 1308
+        timewrite: 2879
+  grisou-31:
+    chassis:
+      serial: 2RL4J82
+    storage_devices:
+      sda:
+        timeread: 1379
+        timewrite: 2928
+  grisou-32:
+    chassis:
+      serial: 2RP3J82
+    storage_devices:
+      sda:
+        timeread: 1306
+        timewrite: 2931
+  grisou-33:
+    chassis:
+      serial: 2RR1J82
+    storage_devices:
+      sda:
+        timeread: 1307
+        timewrite: 2944
+  grisou-34:
+    chassis:
+      serial: 2RM3J82
+    storage_devices:
+      sda:
+        timeread: 1278
+        timewrite: 2896
+  grisou-35:
+    chassis:
+      serial: 2RN1J82
+    storage_devices:
+      sda:
+        timeread: 1331
+        timewrite: 2994
+  grisou-36:
+    chassis:
+      serial: 2M22J82
+    storage_devices:
+      sda:
+        timeread: 1267
+        timewrite: 2897
+  grisou-37:
+    chassis:
+      serial: 2M53J82
+    storage_devices:
+      sda:
+        timeread: 1304
+        timewrite: 2921
+  grisou-38:
+    chassis:
+      serial: 2MD3J82
+    storage_devices:
+      sda:
+        timeread: 1300
+        timewrite: 2919
+  grisou-39:
+    chassis:
+      serial: 2LZYH82
+    storage_devices:
+      sda:
+        timeread: 1288
+        timewrite: 2967
+  grisou-4:
+    chassis:
+      serial: 2ZX2J82
+    storage_devices:
+      sda:
+        timeread: 1287
+        timewrite: 2940
+  grisou-40:
+    chassis:
+      serial: 2M8ZH82
+    storage_devices:
+      sda:
+        timeread: 1288
+        timewrite: 2955
+  grisou-41:
+    chassis:
+      serial: 2LSZH82
+    storage_devices:
+      sda:
+        timeread: 1260
+        timewrite: 2930
+  grisou-42:
+    chassis:
+      serial: 2LY1J82
+    storage_devices:
+      sda:
+        timeread: 1272
+        timewrite: 2911
+  grisou-43:
+    chassis:
+      serial: 2M3ZH82
+    storage_devices:
+      sda:
+        timeread: 1311
+        timewrite: 2956
+  grisou-44:
+    chassis:
+      serial: 2M72J82
+    storage_devices:
+      sda:
+        timeread: 1291
+        timewrite: 2911
+  grisou-45:
+    chassis:
+      serial: 2MC0J82
+    storage_devices:
+      sda:
+        timeread: 1264
+        timewrite: 2860
+  grisou-46:
+    chassis:
+      serial: 2RQ2J82
+    storage_devices:
+      sda:
+        timeread: 1284
+        timewrite: 2906
+  grisou-47:
+    chassis:
+      serial: 2RHZH82
+    storage_devices:
+      sda:
+        timeread: 1287
+        timewrite: 2956
+  grisou-48:
+    chassis:
+      serial: 2RK3J82
+    storage_devices:
+      sda:
+        timeread: 1295
+        timewrite: 2916
+  grisou-49:
+    chassis:
+      serial: 2RG2J82
+    storage_devices:
+      sda:
+        timeread: 1288
+        timewrite: 2918
+  grisou-5:
+    chassis:
+      serial: 2ZQ1J82
+    storage_devices:
+      sda:
+        timeread: 1270
+        timewrite: 2945
+  grisou-6:
+    chassis:
+      serial: 2ZV3J82
+    storage_devices:
+      sda:
+        timeread: 1290
+        timewrite: 3012
+  grisou-7:
+    chassis:
+      serial: 3004J82
+    storage_devices:
+      sda:
+        timeread: 1311
+        timewrite: 3013
+  grisou-8:
+    chassis:
+      serial: 39N0J82
+    storage_devices:
+      sda:
+        timeread: 1288
+        timewrite: 2925
+  grisou-9:
+    chassis:
+      serial: 39H4J82
+    storage_devices:
+      sda:
+        timeread: 1261
+        timewrite: 3020
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
index 46799ea18b629c6e415fb83a93fa02405b54a56d..7e25603b0c6cc1fa130a5ade977f58e4eaf6c786 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-1:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZY2J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1289
-      timewrite: 3014
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZY2J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.1
-      driver: ixgbe
       mac: 24:6e:96:03:0c:60
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
-      mac: 24:6e:96:03:0c:62
-      mounted: false
-      management: false
-    eth4:
       interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:64
-      mounted: false
+      mac: 24:6e:96:03:0c:62
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:65
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:64
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:66
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:64
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:65
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
index 09cf9a6decf3508821b18b699bdd2bc8b80b376d..a01a144672f38cd107ee047e0451d66a519ce582 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-10:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39G0J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1254
-      timewrite: 2878
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39G0J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.10
-      driver: ixgbe
       mac: 24:6e:96:03:0a:38
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:3c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:3d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0a:3a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:e8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:ea
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:3c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:3d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
index 7dfa4efc356922429f5479dfa159591720084fe1..50e85f37465f2ef117a94e286b2cb58ec83a6888 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-11:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3970J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2977
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3970J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:bc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.11
-      driver: ixgbe
       mac: 24:6e:96:03:0e:b8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:bd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0e:ba
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:48
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:4a
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:bc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:bd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
index f776b660bebc1b26e6c05e9654596c21f2137c7f..59b48d46a575d407bef839ed9bed312798e22c29 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-12:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39LZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1286
-      timewrite: 3209
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39LZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.12
-      driver: ixgbe
       mac: 24:6e:96:03:0f:c8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:cc
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0f:ca
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:cd
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:f0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:f2
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:cc
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:cd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
index f0451e59a79ce816a09392cdaa933a3b85ceadc2..f63c08aadab32faac454ae0cdcd202642fce5526 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-13:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39D4J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1275
-      timewrite: 2923
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39D4J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:94
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:95
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.13
-      driver: ixgbe
       mac: 24:6e:96:03:11:90
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:92
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:f8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:fa
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:94
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:95
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
index 5f1617a34f2acdea988d7dab86859f8c1cade72b..815c8b397915fceccaa31f607a633694dc53db69 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-14:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T72J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1293
-      timewrite: 2777
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T72J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.14
-      driver: ixgbe
       mac: 24:6e:96:02:a3:e0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:e4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:e5
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a3:e2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:b4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:b6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a3:e4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a3:e5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
index 1b58442de83614e797bb2fc91e7b55a54b47ec90..24d47d7b56424f9c3014b13fcf827b93752a9350 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-15:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3SZ1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1291
-      timewrite: 2913
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3SZ1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:9f:0c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.15
-      driver: ixgbe
       mac: 24:6e:96:02:9f:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:9f:0d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:9f:0a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:78
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:7a
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:9f:0c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:9f:0d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
index 86266a8aa0cd7f03e072eb3ef93431df692de92e..99bb605d6d63ae1c1bd232aced4e283bca6ae9cf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-16:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZSZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1305
-      timewrite: 2796
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZSZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:8c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.16
-      driver: ixgbe
       mac: 24:6e:96:03:0f:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:8d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0f:8a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:8c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:8e
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:8c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:8d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
index 4d73a606ae8a33d042a5c3c72a869568cec53a03..862bb90780fc11b1b196c321ca5224f5795db53d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-17:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZR2J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2920
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZR2J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:54
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.17
-      driver: ixgbe
       mac: 24:6e:96:02:a1:50
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:55
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a1:52
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:c8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:ca
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a1:54
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a1:55
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
index 67a8b4e30453a4b8280c22e573517dcd86402a5d..8c03ae27639aa5ae82f6cbbc5862d0a170ef5bd4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-18:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZW3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1315
-      timewrite: 2938
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZW3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:94
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.18
-      driver: ixgbe
       mac: 24:6e:96:03:0e:90
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:95
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0e:92
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:40
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:42
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:94
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:95
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
index 8a7d29043490e297fa0c4ff34c0749fa3da66dd6..910f777330cb3c52a1f0482ba5ba17817efbf11e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-19:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39JZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1280
-      timewrite: 2896
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39JZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.19
-      driver: ixgbe
       mac: 24:6e:96:03:0f:a0
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0f:a2
-      mounted: false
       management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:a4
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:f4
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0f:a5
       mounted: false
-      management: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:f6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:a4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0f:a5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
index fdc07212012f236e030ed55d3a2ec5b88ecde2cc..258aa427e813f6b2a6ef25f78933429fbaa88135 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-2:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3020J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1251
-      timewrite: 2915
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3020J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:9c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.2
-      driver: ixgbe
       mac: 24:6e:96:03:0c:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:9d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0c:9a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:54
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:56
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:9c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:9d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
index e1e74af5e07134a50cda0e81ebecbeba68f7a0b9..c9c053ad90a9c6765970d802159b2a736d628f11 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-20:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3933J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1306
-      timewrite: 2934
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3933J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:dc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.20
-      driver: ixgbe
       mac: 24:6e:96:03:09:d8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:dd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:09:da
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:ec
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:ee
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:dc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:dd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
index 1a7669804f5166137fed3fc658a7e4e8d0897e5a..70684dd1a0da806e455b87601719f81334b296c4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-21:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39KZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1308
-      timewrite: 2885
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39KZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:14
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.21
-      driver: ixgbe
       mac: 24:6e:96:03:0a:10
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:15
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0a:12
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:fc
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:fe
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:14
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:15
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
index c80ab65a0aa59788397f9ccc0d4d32d6a39d9422..636f2f3fe244f35447c388e614bad79589fab3c5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-22:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3984J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1305
-      timewrite: 2944
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3984J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.22
-      driver: ixgbe
       mac: 24:6e:96:03:0a:68
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
-      mac: 24:6e:96:03:0a:6a
-      mounted: false
-      management: false
-    eth4:
       interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:6c
-      mounted: false
+      mac: 24:6e:96:03:0a:6a
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:6d
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:e8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:ea
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:6c
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:6d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
index c2d99332822988e0ca23fe0ccec21ee3821980e0..550224c68324cd786f881de4961c154c49ccffbf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-23:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T83J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1290
-      timewrite: 2893
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T83J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:3c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.23
-      driver: ixgbe
       mac: 24:6e:96:02:a1:38
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:3d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a1:3a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:a0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:a2
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a1:3c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a1:3d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
index 55b0b3752c1dfdb515ad5f4484ed0e3c3bfe4712..365d9ae9c5789ab6557cbccc3d401154f6f3feb5 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-24:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T13J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1293
-      timewrite: 2874
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T13J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.24
-      driver: ixgbe
       mac: 24:6e:96:02:a9:80
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
-      mac: 24:6e:96:02:a9:82
-      mounted: false
-      management: false
-    eth4:
       interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:84
-      mounted: false
+      mac: 24:6e:96:02:a9:82
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:85
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:38
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:3a
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a9:84
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a9:85
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
index 097f1f20d4a3f9f52e1de1c45992d523fc0a974c..3355b262bcb875af3170e835428b82a1b5ca59b9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-25:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3SX0J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1298
-      timewrite: 2914
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3SX0J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a7:d4
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.25
-      driver: ixgbe
       mac: 24:6e:96:02:a7:d0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a7:d5
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a7:d2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:f4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:f6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a7:d4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a7:d5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
index 8ceb046e271cec540b389594bc4a25657ae54c55..89ea1a82467ba1847d498b6d96da7653eb94c6d8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-26:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T24J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1308
-      timewrite: 2957
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T24J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:9c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.26
-      driver: ixgbe
       mac: 24:6e:96:02:a1:98
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a1:9d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a1:9a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:34
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:36
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a1:9c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a1:9d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
index 84f880d3284c52c5ba0ab872284e95845b1cfde5..d8bc2afd29fa8b61f1e1288a352f19508f1da94a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-27:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3SY3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1296
-      timewrite: 2904
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3SY3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:74
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.27
-      driver: ixgbe
       mac: 24:6e:96:02:a4:70
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a4:72
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:75
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:c8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:ca
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a4:74
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a4:75
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
index 2bdbef3549bf88bfd5aed0575741b47781177994..952cdfaa7b20656dd4524dea3caf4e288df86beb 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-28:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T44J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2907
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T44J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:c4
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.28
-      driver: ixgbe
       mac: 24:6e:96:02:a3:c0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a3:c5
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a3:c2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:c0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:c2
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a3:c4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a3:c5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
index 0a4a98cc836d1d7769a415106bc72e947ec4bcb1..df4b9fe39d47f84a42d283bf53e67cf2cdf6a719 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-29:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T33J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1306
-      timewrite: 2978
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T33J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:8c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.29
-      driver: ixgbe
       mac: 24:6e:96:02:a9:88
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a9:8d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a9:8a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:90
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:92
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a9:8c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a9:8d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
index 082ae24170be66be6780d39de1f9a1f60370b5d6..08022ae0362c1da86d5efadd03bd29bb3ec97a59 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-3:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZZ1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1273
-      timewrite: 2953
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZZ1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:fc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.3
-      driver: ixgbe
       mac: 24:6e:96:03:0b:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:fd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0b:fa
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:88
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:8a
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0b:fc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0b:fd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
index a166f7f321fb2c57c7a6390efd801cf7f5f70d92..38103f40c8c84dc36500a66d56b1e4ea9931b896 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-30:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3T04J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1308
-      timewrite: 2879
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3T04J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.30
-      driver: ixgbe
       mac: 24:6e:96:02:a4:30
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:34
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a4:35
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a4:32
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:44
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:46
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a4:34
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a4:35
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
index 0dc68dead446a25ede5028f5755fd0a10025212f..bf45d67bd6709b596c63959e301fa095e01fa69d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-31:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RL4J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1379
-      timewrite: 2928
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RL4J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:fc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.31
-      driver: ixgbe
       mac: 24:6e:96:03:10:f8
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:10:fa
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:fd
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:dc
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:de
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:10:fc
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:10:fd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
index 0f093572e2451c1ae2ef03098b4000733e33122d..9547424b44309884751362c31f6498884fc1fffa 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-32:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RP3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1306
-      timewrite: 2931
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RP3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.32
-      driver: ixgbe
       mac: 24:6e:96:03:11:d0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:d4
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:d2
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:d5
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:2c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:2e
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:d4
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:d5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
index a04db70757495852c943c8cae666645c34fd5760..3716316b03e7362f1769d8b6f55be6ccf1a12cb0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-33:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RR1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1307
-      timewrite: 2944
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RR1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:b4
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.33
-      driver: ixgbe
       mac: 24:6e:96:03:09:b0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:b5
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:09:b2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:e4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:e6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:b4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:b5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
index 654086fa7e475cf1863e13f6c60a094347cb0e05..7697a5bed84bc1988e36d328f025a57e7a9a382c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-34:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RM3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1278
-      timewrite: 2896
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RM3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.34
-      driver: ixgbe
       mac: 24:6e:96:03:1f:c8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:cc
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:1f:cd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:1f:ca
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:fc
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:fe
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:1f:cc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:1f:cd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
index 304ab5bf16f813a30c0a12bfb371333e8a78acba..1ab044dc3e8aae5d872b6cc2353ca4425c0fbd6f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-35:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RN1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1331
-      timewrite: 2994
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RN1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:64
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.35
-      driver: ixgbe
       mac: 24:6e:96:03:11:60
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:65
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:62
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:d0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:d2
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:64
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:65
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
index b3057e264e93ff6a1a393ef7eae695c52d892215..82032a7730db7bcbf6783e85bf7411a75522dc88 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-36:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2M22J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1267
-      timewrite: 2897
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2M22J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:74
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:75
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.36
-      driver: ixgbe
       mac: 24:6e:96:03:11:70
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:72
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:c0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:c2
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:74
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:75
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
index cfd571e580bd0b54bb312a405f5bed100a3e580f..f553165dfad66f3c45a4d4b9bb2474213c497bae 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-37:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2M53J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1304
-      timewrite: 2921
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2M53J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.37
-      driver: ixgbe
       mac: 24:6e:96:03:23:28
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
-      mac: 24:6e:96:03:23:2a
-      mounted: false
-      management: false
-    eth4:
       interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:23:2c
-      mounted: false
+      mac: 24:6e:96:03:23:2a
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:23:2d
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:60
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:62
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:23:2c
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:23:2d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
index cfbd2147f422336fa51fe985a0ac9ca37f0ec832..04b992c62092b9b09b19b212d5955e3639fdb48d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-38:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2MD3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1300
-      timewrite: 2919
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2MD3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.38
-      driver: ixgbe
       mac: 24:6e:96:03:0c:00
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
-      mac: 24:6e:96:03:0c:02
-      mounted: false
-      management: false
-    eth4:
       interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:04
-      mounted: false
+      mac: 24:6e:96:03:0c:02
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:05
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:74
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:76
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:04
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:05
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
index 4caa84502de143fe55bb79a1374011ec57ec76d3..0057c3801e50f9bb2abca6d759b8c002a88e375c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-39:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2LZYH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2967
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2LZYH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.39
-      driver: ixgbe
       mac: 24:6e:96:03:09:c0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:c4
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:c5
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:09:c2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:08
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:0a
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:c4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:c5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
index b351caf7365becf4385bd505645646458707c0dc..0d3622a40e9a12316e0f9a325e870c1d9fb63f06 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-4:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZX2J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2940
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZX2J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.4
-      driver: ixgbe
       mac: 24:6e:96:03:0d:40
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:44
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:45
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0d:42
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:bc
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:be
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:44
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:45
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
index 0a8fad5b195a8ddc969c55542d8427e88d14a5ef..52cdae075810d49fd0e5c1f79434b78be8972a85 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-40:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2M8ZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2955
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2M8ZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.40
-      driver: ixgbe
       mac: 24:6e:96:03:21:58
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:21:5c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:21:5d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:21:5a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:fc
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:fe
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:21:5c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:21:5d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
index ba1d4c2d8dd55edfa1656916ad8c047294182f1b..3ae952024b35a03df0df1a4a5d13836299b2495d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-41:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2LSZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1260
-      timewrite: 2930
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2LSZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:fc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.41
-      driver: ixgbe
       mac: 24:6e:96:03:11:f8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:fd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:fa
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:7c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:7e
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:fc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:fd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
index 9b196ea04e18c712c3683e54944f2c33e18e5e85..124d1bf1af56a1fe35ccb332fbeb95f04dcfc759 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-42:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2LY1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1272
-      timewrite: 2911
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2LY1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.42
-      driver: ixgbe
       mac: 24:6e:96:03:0b:b8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:bc
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0b:bd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0b:ba
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:4c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:4e
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0b:bc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0b:bd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
index 768b441c639c328eea2e16d5eff8e3990b0fdfa7..a575570aba4b5a8547f61ad1a77b96077ad68062 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-43:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2M3ZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1311
-      timewrite: 2956
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2M3ZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:e4
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.43
-      driver: ixgbe
       mac: 24:6e:96:03:09:e0
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:09:e5
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:09:e2
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:98
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:9a
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:e4
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:09:e5
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
index 51f1a06efd6a74358509f2d2efa0e5faca95bc41..d852a6163da9bfe357e18912e880f5db0651e6fd 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-44:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2M72J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1291
-      timewrite: 2911
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2M72J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.44
-      driver: ixgbe
       mac: 24:6e:96:03:0c:10
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:14
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0c:15
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0c:12
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:d8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:da
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:14
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0c:15
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
index 8cc9cf7bbd94ac62e7d825da5e4992e6556f3aa4..1288f79307262a5b4e2471edf3a596e8c678ec6c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-45:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2MC0J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1264
-      timewrite: 2860
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2MC0J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:6c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.45
-      driver: ixgbe
       mac: 24:6e:96:03:0d:68
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:6d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0d:6a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:e4
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4e:e6
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:6c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:6d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
index abdcc4241fb448343a9552160a8691c5465af738..7ca8aab33d02b9bacd2c5495fee9e08f6af28727 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-46:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RQ2J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1284
-      timewrite: 2906
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RQ2J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.46
-      driver: ixgbe
       mac: 24:6e:96:03:10:18
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:1c
-      mounted: false
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:1d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:10:1a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:e0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:e2
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:10:1c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:10:1d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
index d4358de28a152275f287b70a1d0a3c2cf6c08a15..627b6c05f79e57e44460a452cec3525e814047f8 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-47:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RHZH82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1287
-      timewrite: 2956
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RHZH82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:44
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.47
-      driver: ixgbe
       mac: 24:6e:96:03:0a:40
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:45
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0a:42
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:48
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4a:4a
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:44
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:45
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
index 2177a1d0be45280d091aafaa14c7d6964ca730a7..7125925661bba9bb00475f9cf4686d0f33a057c1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-48:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RK3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1295
-      timewrite: 2916
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RK3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:54
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.48
-      driver: ixgbe
       mac: 24:6e:96:03:0d:50
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0d:55
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0d:52
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:c8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4c:ca
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:54
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0d:55
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
index 45bcf53785f123ed610574fd5355bd812eb7c469..9377a637363d235dff044268d03575db7dfa03f0 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-49:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2RG2J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2918
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2RG2J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:84
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.49
-      driver: ixgbe
       mac: 24:6e:96:03:0e:80
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0e:85
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0e:82
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:cc
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:ce
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:84
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0e:85
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
index 9869abada4707f62ea8dc0f8742f0e32c9b98b95..ce5e2ec70ce0a62de9ffecbd50ad09316f072f6f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-5:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZQ1J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1270
-      timewrite: 2945
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZQ1J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:ac
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.5
-      driver: ixgbe
       mac: 24:6e:96:02:a0:a8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:a0:ad
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:a0:aa
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:50
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:52
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a0:ac
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:a0:ad
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
index 0802ad7717dec6094cc213c20b21fba85d42b156..52a75a038837ad80a171434e30da1f904cf2a2af 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-6:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 2ZV3J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1290
-      timewrite: 3012
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 2ZV3J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:34
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.6
-      driver: ixgbe
       mac: 24:6e:96:03:0a:30
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:0a:32
-      mounted: false
       management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:0a:35
       mounted: false
-      management: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:b8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:ba
+      management: false
       mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:34
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:0a:35
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
index 235cdf603d35a073e4377ca8c09f2d71c6520c05..c53cf88ed7f3ee68f04d5ef1c970effc315ee16f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-7:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 3004J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1311
-      timewrite: 3013
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 3004J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:5c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.7
-      driver: ixgbe
       mac: 24:6e:96:03:10:58
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:10:5d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:10:5a
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:ac
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4b:ae
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:10:5c
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:10:5d
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
index 41d7853a88c7395f47212fdd96af4e601915e708..651f2b377353bd8e214a67ba7b66531476426f05 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-8:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39N0J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1288
-      timewrite: 2925
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39N0J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:bc
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.8
-      driver: ixgbe
       mac: 24:6e:96:03:11:b8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:03:11:bd
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:03:11:ba
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:d0
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7e:4d:d2
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:bc
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:03:11:bd
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
index 20de41126a94d929f348b215163ce3bdea6c09f6..cfed793dcc0bff58e470ba40894c4a96161aeefb 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -1,85 +1,69 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 grisou-9:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 06/03/2015
     vendor: Dell Inc.
     version: 1.3
-    release_date: 06/03/2015
   chassis:
-    serial: 39H4J82
     manufacturer: Dell Inc.
     name: PowerEdge R630
-  storage_devices:
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-      timeread: 1261
-      timewrite: 3020
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: ST600MM0088
-      rev: TT31
-  supported_job_types:
-    virtual: ivt
+    serial: 39H4J82
   main_memory:
     ram_size: 135291469824
   network_adapters:
-    eth4:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:97:ac
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.72.9
-      driver: ixgbe
       mac: 24:6e:96:02:97:a8
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth5:
-      interface: Ethernet
-      driver: igb
-      mac: 24:6e:96:02:97:ad
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 24:6e:96:02:97:aa
-      mounted: false
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:a8
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:7f:34:aa
+      management: false
+      mounted: false
+    eth4:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:97:ac
+      management: false
       mounted: false
+    eth5:
+      driver: igb
+      interface: Ethernet
+      mac: 24:6e:96:02:97:ad
       management: false
-  operating_system:
-    name: debian
-    kernel: 3.16.0-4-amd64
-    version: "8.2"
-  processor:
-    clock_speed: 3200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0088
+      rev: TT31
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
index fbb52af09d5d25c7d5771847be249e8894c10928..989fe57f4b2e2ede50ff8a01199b7bbe9bc4af0d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-100:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:92
-      ip: 172.16.66.100
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.100
+      mac: 00:e0:81:b5:56:92
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:93
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b5:56:93
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
index 2fb25bdd4cf8090891a702c0dcce59ac76b97c6d..f21b3a9c6999705109eef9dae44839b39b055a10 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-101:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b5:56:90
-      ip: 172.16.66.101
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.101
+      mac: 00:e0:81:b5:56:90
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:56:91
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b5:56:91
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
index 20a53350ef7f4eab547aee15ad5db1ef9912b42a..f96d6a1447e78fb3b70c3edbc995d49d8d7b20b9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-102:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b5:9c:92
-      ip: 172.16.66.102
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.102
+      mac: 00:e0:81:b5:9c:92
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:93
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b5:9c:93
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
index 0fbc874147952d07db59b4e4069e1d1418473563..8452f79e93c8b03e9269fa2faddc247ae8f18d0a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-106:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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: 04/24/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b8:b7:ee
-      ip: 172.16.66.106
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.106
+      mac: 00:e0:81:b8:b7:ee
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b8:b7:ef
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b8:b7:ef
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
index 4928cb06f7858fcf4fe2a1836bf0aa5c55f745c7..a824d118033c63db217654b84b0d5d4841ab8a15 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-107:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b1:c4:76
-      ip: 172.16.66.107
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.107
+      mac: 00:e0:81:b1:c4:76
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:77
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:77
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
index 4dfdf084cb474b16a448370aefd720f73d3165b4..635fad05820c665e9a959a46ea40fc8926ab73a2 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-108:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b1:c0:12
-      ip: 172.16.66.108
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.108
+      mac: 00:e0:81:b1:c0:12
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:13
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:13
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
index c0b430dabc3ec8fece79637ceee2e77a0b52677a..07d526bc3dc247a71db2c77dd3d8cf1f0f1600f6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-109:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:bf:90
-      ip: 172.16.66.109
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.109
+      mac: 00:e0:81:b1:bf:90
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:bf:91
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:bf:91
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
index e44fb66c38aff7b9c4007203a1899056a810508b..69337d03e74579739be876b5bcfed93892ee18a9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-113:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b1:c4:5e
-      ip: 172.16.66.113
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.113
+      mac: 00:e0:81:b1:c4:5e
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:5f
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:5f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
index fd115342f712b98e735472cca6796e2664649d73..c85c4787ff645dbe23dc14883ab5dd9721e773d9 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-124.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-124:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c0:6c
-      ip: 172.16.66.124
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.124
+      mac: 00:e0:81:b1:c0:6c
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:6d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:6d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
index ecc3ef43227431c8757311f053ead554743010a3..236d3c7d39aa5667905f822b2c15139b4bd37be8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-126.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-126:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b1:c4:92
-      ip: 172.16.66.126
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.126
+      mac: 00:e0:81:b1:c4:92
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:93
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:93
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
index ac66536c4e1652c500409bb687b5d218f21baa40..0f8258abb27b1541ace5005b67f66f6f296d22a4 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-133.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-133:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c6:0c
-      ip: 172.16.66.133
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.133
+      mac: 00:e0:81:b1:c6:0c
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c6:0d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c6:0d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
index ccf2389ee3f668dcc6b5280f3c278520ff258416..297e14d6741d6b84ba2fcd2800be3814faf9a54c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-15.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-15:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.2.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: 04/24/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 12884901888
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b8:b7:de
-      ip: 172.16.66.15
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.15
+      mac: 00:e0:81:b8:b7:de
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b8:b7:df
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b8:b7:df
       management: false
-  main_memory:
-    ram_size: 12884901888
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
index e93403801f24cc820fbad85ccab3d775c6ae69aa..aea3b3bad1615b6983e43f6ae2e503588a260046 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-16.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-16:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 15032385536
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:8c
-      ip: 172.16.66.16
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.16
+      mac: 00:e0:81:b2:c5:8c
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:8d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:8d
       management: false
-  main_memory:
-    ram_size: 15032385536
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
index 25ec1be1bd1463ad8f71deae9d332fd2c90ffcc1..72b2021157fce1ebcce7003b4ff269e3626f4c85 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-17.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-17:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c1:12
-      ip: 172.16.66.17
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.17
+      mac: 00:e0:81:b2:c1:12
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:13
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:13
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
index 96b47891531ff65c96fecebe0f0a9770e15a780b..965c1b34c897e8e9da7879c36e40ec38077d1c48 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-18.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-18:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c4:d2
-      ip: 172.16.66.18
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.18
+      mac: 00:e0:81:b2:c4:d2
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:d3
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:d3
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
index 826c9d3e53f15c0ccfc4b0662f324d47134940c0..9f73007252ba5560b25544541429ea503f2327e5 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-19.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-19:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c1:38
-      ip: 172.16.66.19
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.19
+      mac: 00:e0:81:b2:c1:38
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:39
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:39
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
index 48f1f18937ae3ee8e80247169a440c5353b7a4b6..c5d73f1cc617b0126cb727f84d8b68a6e801a917 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-2.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-2:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c0:dc
-      ip: 172.16.66.2
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.2
+      mac: 00:e0:81:b2:c0:dc
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:dd
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:dd
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
index ce1ca04a04dbd1996caa3ccb0da3891a19c50b4d..518a05e9dfff440acb284fb30e6881bcc570452c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-24.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-24:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:f6
-      ip: 172.16.66.24
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.24
+      mac: 00:e0:81:b2:c0:f6
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:f7
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:f7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
index 9c9dc4ac195e26ec79a20a56b4961a8662d33d60..f25be0465cf4d3afe53ba568da13b097c7dd9b84 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-26.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-26:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:bf:9c
-      ip: 172.16.66.26
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.26
+      mac: 00:e0:81:b2:bf:9c
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:9d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:9d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
index 93dea2bc3d6af1e5e7d04b6ded9670c6cc9a84a6..36771bb75fa3b6aba9a6331f4ab861997d41a767 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-27.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-27:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:bf:d2
-      ip: 172.16.66.27
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.27
+      mac: 00:e0:81:b2:bf:d2
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:d3
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:d3
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
index 4aef00e4b504ed33df6e194f7063981869f13ef6..ea7fe000521d4816086b908721690e10a5c85c76 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-28.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-28:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:ca
-      ip: 172.16.66.28
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.28
+      mac: 00:e0:81:b2:c0:ca
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:cb
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:cb
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
index 73d3a8d6475bfad79cdc9b90c95d421efda19141..88781ccd35d0c0a9f4119af6e63250599480569b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-29.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-29:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 15032385536
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c1:a6
-      ip: 172.16.66.29
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.29
+      mac: 00:e0:81:b2:c1:a6
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:a7
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:a7
       management: false
-  main_memory:
-    ram_size: 15032385536
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
index 74495ac5e2e369c1499cdc7a9d976c8c48954e5b..194182edff29f99539abfd48cc0738ec4fa7d137 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-31.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-31:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c2:3e
-      ip: 172.16.66.31
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.31
+      mac: 00:e0:81:b2:c2:3e
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:3f
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:3f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
index 5a8a52dd124043218495afc302246775f6c576e3..9bd3dec03d72a9f77bbb0bd4bc994260ee22f42d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-33.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-33:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b1:c4:10
-      ip: 172.16.66.33
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.33
+      mac: 00:e0:81:b1:c4:10
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c4:11
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c4:11
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
index 81d69e8687f2f9f6d57e7ce4cd8eaef1205564bd..059e31b534b0f0821148b83aed424ef7727c6b4a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-34.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-34:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c0:12
-      ip: 172.16.66.34
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.34
+      mac: 00:e0:81:b2:c0:12
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:13
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:13
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
index f9e665469f79108780c0a624f3998bda3de001b0..6625970b7751f71f9426b2619003d22c682521a6 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-35.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-35:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c1:c6
-      ip: 172.16.66.35
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.35
+      mac: 00:e0:81:b2:c1:c6
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:c7
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:c7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
index b46ca49406339d242d1bd1a5852f1f9a1cc201a8..3d9d5db668efbf60736fecc7ca3d661d8119fc03 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-36.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-36:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c2:1c
-      ip: 172.16.66.36
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.36
+      mac: 00:e0:81:b2:c2:1c
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:1d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:1d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
index c8b09e701faf2c79544799ddac6e79304afca51f..1d224ac4b22e1103bbe63e99738c644d317f2d12 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-37.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-37:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b1:c0:92
-      ip: 172.16.66.37
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.37
+      mac: 00:e0:81:b1:c0:92
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b1:c0:93
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b1:c0:93
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
index 5a469fb8b97ab95e7ace38cd769070ca908bb667..f799afccec18cc65a4be6f37cf9b02a223564b98 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-4.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-4:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c0:74
-      ip: 172.16.66.4
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.4
+      mac: 00:e0:81:b2:c0:74
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:75
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:75
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
index 37945e0f6bb75562827ef19d2bb6d06611be1009..fec37d3ad675879e2705f4c70d49411e755b3e6b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-45.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-45:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c4:ca
-      ip: 172.16.66.45
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.45
+      mac: 00:e0:81:b2:c4:ca
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:cb
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:cb
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
index b4d948a8e3f647dfffe7d826f5d4a266eb5e2939..2c9aef54e0a56ee855e7009fe5e644fe9557cf71 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-46.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-46:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c5:c6
-      ip: 172.16.66.46
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.46
+      mac: 00:e0:81:b2:c5:c6
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:c7
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:c7
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
index 63a015a0a208e2e7f1915f8fa59f8d3aefa82e0f..acdbee0e85ae1d5898c5fe779a99dab50af7d72c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-47.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-47:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c0:82
-      ip: 172.16.66.47
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.47
+      mac: 00:e0:81:b2:c0:82
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:83
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:83
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
index 85b363017fa6d9119910b9e83529f5e096bf4356..ccfe051dc59bf17517b87c8182f879730b33e48d 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-48.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-48:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c5:62
-      ip: 172.16.66.48
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.48
+      mac: 00:e0:81:b2:c5:62
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:63
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:63
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
index 5fe6cba683f35dd1f94972210df2b7de6d2cf482..50226644e4868bdd32e3ff4895223ed150bd0ed7 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-5.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-5:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c1:ee
-      ip: 172.16.66.5
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.5
+      mac: 00:e0:81:b2:c1:ee
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:ef
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:ef
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
index eca39b7655eeb34e0c3f74b4a8497f666a35925b..62ec6e892a08cad3cf4ce983744e21b51999516a 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-60.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-60:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c5:9c
-      ip: 172.16.66.60
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.60
+      mac: 00:e0:81:b2:c5:9c
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:9d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:9d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
index 9bf4f007791a24b7058846f44e28e46d7cea6a17..752ef446b93c637417c409db7574e96e2f613f96 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-61.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-61:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c5:94
-      ip: 172.16.66.61
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.61
+      mac: 00:e0:81:b2:c5:94
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:95
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:95
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
index f33dd5c2ebd1c5fa5196d378a958ad00a0a6c16a..1f2739d0e5513e41f8a0f41d5ced125681d2758c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-62.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-62:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c0:9c
-      ip: 172.16.66.62
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.62
+      mac: 00:e0:81:b2:c0:9c
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:9d
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:9d
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
index 28902541cdda0f8761dce937562ea9425d6eaeec..af6913ad132e81c76a765295ba9400b4116479bd 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-63.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-63:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:1e
-      ip: 172.16.66.63
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.63
+      mac: 00:e0:81:b2:c2:1e
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:1f
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:1f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
index 0ceffecb13ebea1f5a1e27c80d64b7579370f3c8..364c9021eb524e650e3158cf805b792b140ac5df 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-64.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-64:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c5:da
-      ip: 172.16.66.64
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.64
+      mac: 00:e0:81:b2:c5:da
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:db
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:db
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
index 228424268bd34f8557121a3842e7fccb970a91c4..6306710c8bc0cf1c56689a22c236b02bf0b677ff 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-65.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-65:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c0:68
-      ip: 172.16.66.65
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.65
+      mac: 00:e0:81:b2:c0:68
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c0:69
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c0:69
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
index 6fe60b7a141689f46b50e6e407608866146a00fe..9eda1cb02a70071b57d515101f338a93f9e5980b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-66.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-66:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A3AA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c4:c2
-      ip: 172.16.66.66
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.66
+      mac: 00:e0:81:b2:c4:c2
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:c3
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:c3
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A3AA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
index 609425dc662c5af059e65855474fb435b7b6600d..e82b085b55ce68ee7ad2aa7472a2fcca7d4551d8 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-67.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-67:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:bf:b4
-      ip: 172.16.66.67
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.67
+      mac: 00:e0:81:b2:bf:b4
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:b5
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:b5
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
index eb24d20480fa0f844ce80aacf76b8d67ff2959f8..e04ab5be062d1f172853f5d9aaa43b7cde6fa865 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-68.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-68:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ac
-      ip: 172.16.66.68
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.68
+      mac: 00:e0:81:b2:c1:ac
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:ad
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:ad
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
index f424830863e6176caa5ea7ad2dc08f6c9aa2befd..e87840fcc0e24fe229016c9e049c1ef240427b13 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-69.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-69:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:bf:dc
-      ip: 172.16.66.69
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.69
+      mac: 00:e0:81:b2:bf:dc
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:bf:dd
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:bf:dd
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
index ffbf49b1a6eb8b98ed6cdc8e4812766fca3182e4..c3b89d0d6c9ccac9477a1f6ae51eaf6355af2aaf 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-70.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-70:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDS72103
-      rev: A39C
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:2a
-      ip: 172.16.66.70
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.70
+      mac: 00:e0:81:b2:c2:2a
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:2b
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:2b
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDS72103
+      rev: A39C
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
index 1277db2bd52f0b59155962efb76ba01c6a124cdf..0584f635dfde3de47d87b505a7c5f529eed2399b 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-71.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-71:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c5:dc
-      ip: 172.16.66.71
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.71
+      mac: 00:e0:81:b2:c5:dc
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c5:dd
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c5:dd
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
index b304b6723b16139a3d0d96ae8c32dcbef0820944..a53534c356354358cf3a725fcaebf1bd6c78f9c0 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-72.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-72:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c1:ce
-      ip: 172.16.66.72
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.72
+      mac: 00:e0:81:b2:c1:ce
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c1:cf
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c1:cf
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
index 5deda4b1b96666fec79429ccbc64043cfc318637..2b507c3dda45f57b9dec1b2644b9cf0e474959cb 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-73.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-73:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 1000000000
-      mac: 00:e0:81:b2:c2:72
-      ip: 172.16.66.73
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.73
+      mac: 00:e0:81:b2:c2:72
       management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:73
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:73
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
index 62adbffa6ee184ac22b2cb547e639bd54d23d049..afb9d6789cce9c042c71ceca593c92c0da419a2c 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-74.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-74:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c2:84
-      ip: 172.16.66.74
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.74
+      mac: 00:e0:81:b2:c2:84
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c2:85
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c2:85
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
index bb10f67b9e5c7ea2e3f45c262287b1e6be6212c4..a3227c7a12d5223b892afe161f4db7286f9a9717 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-8.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-8:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDP72503
-      rev: A5CA
-      device: sda
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 8
-    platform_type: x86_64
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b2:c4:d8
-      ip: 172.16.66.8
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.8
+      mac: 00:e0:81:b2:c4:d8
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b2:c4:d9
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b2:c4:d9
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDP72503
+      rev: A5CA
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
index 236a7031d2a0eaab7fec67d7d41e51c09850575a..161588db95acb5d86dfcc20c724a4272b2da7b2f 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-93.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-93:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 08/21/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b5:9c:1e
-      ip: 172.16.66.93
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.93
+      mac: 00:e0:81:b5:9c:1e
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b5:9c:1f
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b5:9c:1f
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
index 88cfde9e523007bd7aa8e4512baaab4aec397495..6fb95a9d53ac79e6b7e8ec58eed307f92e040360 100644
--- a/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/talc/nodes/talc-95.yaml
@@ -1,57 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 talc-95:
-  bios:
-    vendor: Phoenix Technologies LTD
-    version: V1.05
-    release_date: 04/24/2009
-  storage_devices:
-    sda:
-      size: 320072933376
-      model: Hitachi HDT72103
-      rev: A31B
-      device: sda
-  operating_system:
-    kernel: 3.2.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: 04/24/2009
+    vendor: Phoenix Technologies LTD
+    version: V1.05
   chassis:
-    name: S5393
     manufacturer: TYAN Computer Corporation
-  supported_job_types:
-    virtual: ivt
+    name: S5393
+    serial: 
+  main_memory:
+    ram_size: 17179869184
   network_adapters:
     eth0:
-      mounted: true
-      enabled: true
-      rate: 100000000
-      mac: 00:e0:81:b8:b8:50
-      ip: 172.16.66.95
-      mountable: true
       driver: e1000e
       interface: Ethernet
+      ip: 172.16.66.95
+      mac: 00:e0:81:b8:b8:50
       management: false
+      mounted: true
+      rate: 100000000
     eth1:
-      mounted: false
-      enabled: false
-      mac: 00:e0:81:b8:b8:51
-      mountable: false
       driver: e1000e
       interface: Ethernet
+      mac: 00:e0:81:b8:b8:51
       management: false
-  main_memory:
-    ram_size: 17179869184
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: Hitachi HDT72103
+      rev: A31B
+      size: 320072933376
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nancy/clusters/talc/talc_diff.yaml b/input/grid5000/sites/nancy/clusters/talc/talc_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ed0e074de4dae9ebb35124cfa2062044e3944585
--- /dev/null
+++ b/input/grid5000/sites/nancy/clusters/talc/talc_diff.yaml
@@ -0,0 +1,25 @@
+---
+nodes:
+  talc-[-]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 3.2.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
diff --git a/input/grid5000/sites/nantes/clusters/econome/econome_diff.yaml b/input/grid5000/sites/nantes/clusters/econome/econome_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c5054be50515654acd3476c430f6392398b4be74
--- /dev/null
+++ b/input/grid5000/sites/nantes/clusters/econome/econome_diff.yaml
@@ -0,0 +1,27 @@
+---
+nodes:
+  econome-[1-22]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        mountable: false
+      eth3:
+        enabled: false
+        mountable: false
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 20971520
+      clock_speed: 2200000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
+      vendor: Intel
+      version: E5-2660
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
index cb806f35ee45481ca8599c52ec5fdf4f317ad5ce..dde51446a24b39321a30db02841b68f6fee5e752 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-1:
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: CP2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:4c
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.1
-      driver: ixgbe
       mac: a0:36:9f:0e:a1:f4
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:0e:a1:f6
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 78:45:c4:f9:15:4c
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 78:45:c4:f9:15:4d
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a1:f6
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.1
-      mac: 78:45:c4:f9:15:4e
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial: CP2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
index d7a06e07893f6ee63c93532ad075b5c30981abaa..ea6d6fb73f0aed6b2334eb5fa5ce58d724efe4d5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: G9GYG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:14:b0
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.10
-      driver: ixgbe
       mac: a0:36:9f:0e:24:80
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:0e:24:82
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 78:45:c4:f9:14:b0
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 78:45:c4:f9:14:b1
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:82
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.10
-      mac: 78:45:c4:f9:14:b2
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: G9GYG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
index a52fde72248e789119de4cefc8963a09bfed451b..f87152c037319e0dc23a6e417674220a265fc4cf 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: J9GYG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:9a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:9b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.11
-      driver: ixgbe
       mac: a0:36:9f:0e:36:60
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:36:62
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:9a
       management: false
-    bmc:
-      ip: 172.17.192.11
-      mac: 78:45:c4:f9:15:9c
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:9b
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: J9GYG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
index 55f3a1e47d917ddc7b33438f21bc9a4baffd11fd..79b68c46846dd8031698e59e9aff598fa18b7b33 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-12:
-  supported_job_types:
-    virtual: ivt
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: H9GYG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.12
-      mac: 78:45:c4:f9:15:a5
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:a3
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:a4
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.12
-      driver: ixgbe
       mac: a0:36:9f:0e:26:e4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:26:e6
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:a3
       management: false
-  chassis:
-    serial: H9GYG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:a4
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
index 2563ba98718a9f7c79fb7fb2206137b0a47c45fc..7234a0ce9cb3368dca9e378d68956241813f913b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-13:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: HN2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:5a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:5b
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.13
-      driver: ixgbe
       mac: a0:36:9f:0e:23:d4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:23:d6
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:5a
       management: false
-    bmc:
-      ip: 172.17.192.13
-      mac: 78:45:c4:f9:2c:5c
-  main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:5b
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  chassis:
-    serial: HN2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
index 399643544aac71055f173628c686708c8eed853d..80a91bc245f45f216deb976b0c6c3f281c408d63 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-14:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: JN2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
   bios:
+    release_date: 09/06/2013
     vendor: Dell Inc.
     version: 2.1
-    release_date: 09/06/2013
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: JN2YG5J
   main_memory:
-    ram_size: 68719476736
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.14
-      mac: 78:45:c4:f9:2c:71
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:6f
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:70
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.14
-      driver: ixgbe
       mac: a0:36:9f:0e:a2:b8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:a2:ba
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:6f
       management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:70
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
index ae1ceadfc494c12401da83772d293011f8a4795f..9eee36309820256db16732b6f0b06dd6c4ac07df 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -1,65 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
   bios:
+    release_date: 09/06/2013
     vendor: Dell Inc.
     version: 2.1
-    release_date: 09/06/2013
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  supported_job_types:
-    virtual: ivt
   chassis:
-    serial: 1P2YG5J
     manufacturer: Dell Inc.
     name: PowerEdge C6220
+    serial: 1P2YG5J
   main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:fa:dd:9c
-      rate: 1000000000
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:fa:dd:9d
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.15
-      driver: ixgbe
       mac: a0:36:9f:01:fd:70
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:01:fd:72
+      management: false
+      mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:fa:dd:9c
+      management: false
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:fa:dd:9d
       management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
index 02be2bab8a317645e94f726817ff51e313591e40..0d003d9661b24193aff79d5ebe73ab5605935e54 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-16:
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 2P2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: 2P2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.16
-      mac: 78:45:c4:f9:2d:b2
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:b0
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:b1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.16
-      driver: ixgbe
       mac: a0:36:9f:0e:a7:dc
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:a7:de
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2d:b0
       management: false
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2d:b1
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  main_memory:
-    ram_size: 68719476736
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
index 15cbf10b1c123b1e054d5f153e37bebd0c8e128c..79359a011b649d1e6c65b05576c74ebad7cb0135 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-17:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: 1Q2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:33
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:34
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.17
-      driver: ixgbe
       mac: a0:36:9f:0e:a2:64
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:a2:66
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:33
       management: false
-    bmc:
-      ip: 172.17.192.17
-      mac: 78:45:c4:f9:2c:35
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:34
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial: 1Q2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
index f20d5c4666b5c2be68c68265df4f3b93fe2c2ff6..6bd063e0e98782ddd5bbbfeb762da49084d24043 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-18:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: 2Q2YG5J
   main_memory:
-    ram_size: 68719476736
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.18
-      mac: 78:45:c4:f9:2d:73
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:71
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2d:72
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.18
-      driver: ixgbe
       mac: a0:36:9f:0e:36:a0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:36:a2
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2d:71
       management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2d:72
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  chassis:
-    serial: 2Q2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
index a84cd1bafc9a6361c97380a75c997260aa8814dc..5503d1a6cf1a1a6c12505655d8a60178328ff585 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -1,62 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-19:
-  supported_job_types:
-    virtual: ivt
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 04/26/2012
     vendor: Dell Inc.
     version: 1.0
-    release_date: 04/26/2012
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: JN30D5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:46:f1
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.19
-      driver: ixgbe
       mac: 90:e2:ba:1a:6a:e0
-      rate: 10000000000
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: 90:e2:ba:1a:6a:e1
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 84:8f:69:fd:46:f1
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:46:f2
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:6a:e1
       mounted: false
-      management: false
-  chassis:
-    serial: JN30D5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
index eef6f56bc55bd56a90973469375bf3a3e24a10ad..725a0d672981cccdf38d643c1402a81bf0569342 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: DP2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:88
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:89
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.2
-      driver: ixgbe
       mac: a0:36:9f:0e:36:38
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:36:3a
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:88
       management: false
-    bmc:
-      ip: 172.17.192.2
-      mac: 78:45:c4:f9:15:8a
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial: DP2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  main_memory:
-    ram_size: 68719476736
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:89
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
index 223fe11c463d43e506f47a839d33d67302a7686d..5520e64c45613e41eed58abfae3f4e64b6641e62 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -1,63 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-20:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 04/26/2012
+    vendor: Dell Inc.
+    version: 1.0
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: HN30D5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.20
-      driver: ixgbe
       mac: 90:e2:ba:1a:6b:3c
-      rate: 10000000000
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: 90:e2:ba:1a:6b:3d
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:47:09
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:47:0a
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:6b:3d
       mounted: false
-      management: false
-  chassis:
-    serial: HN30D5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  main_memory:
-    ram_size: 68719476736
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 04/26/2012
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
index 03ce9e26760874eec3d33c71976685aa962d96e2..8e44dec063dcc1fb7b5d0ae3ec14015982456dcd 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -1,62 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-21:
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
   bios:
+    release_date: 04/26/2012
     vendor: Dell Inc.
     version: 1.0
-    release_date: 04/26/2012
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: 2P30D5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 18:03:73:ff:be:70
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 18:03:73:ff:be:71
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.21
-      driver: ixgbe
       mac: 90:e2:ba:1a:69:98
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: 90:e2:ba:1a:69:99
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 18:03:73:ff:be:70
       management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  chassis:
-    serial: 2P30D5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 18:03:73:ff:be:71
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 68719476736
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
index 968ea8bedc4b25537ac666063dc9a8690c744106..cba29c2483bc20cf770a62f07548c047750e57d5 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -1,62 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-22:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 04/26/2012
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 1P30D5J
     manufacturer: Dell Inc.
     name: PowerEdge C6220
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
+    serial: 1P30D5J
   main_memory:
-    ram_size: 68719476736
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 84:8f:69:fd:4f:e2
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.22
-      driver: ixgbe
       mac: 90:e2:ba:1a:69:c0
-      rate: 10000000000
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: 90:e2:ba:1a:69:c1
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 84:8f:69:fd:4f:e2
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 84:8f:69:fd:4f:e3
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: 90:e2:ba:1a:69:c1
       mounted: false
-      management: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 04/26/2012
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
index 954cd62fa81d6d57c48887d7da96562005e2da06..6ea4491a4a99193c39b1b777e8253d59eea1443a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-3:
-  chassis:
-    serial: FP2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
-  supported_job_types:
-    virtual: ivt
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 09/06/2013
     vendor: Dell Inc.
     version: 2.1
-    release_date: 09/06/2013
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: FP2YG5J
   main_memory:
-    ram_size: 68719476736
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:99
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:9a
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.3
-      driver: ixgbe
       mac: a0:36:9f:0e:35:b0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:35:b2
-      enabled: false
-      mountable: false
+      management: false
+      mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:99
+      management: false
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:9a
       management: false
-    bmc:
-      ip: 172.17.192.3
-      mac: 78:45:c4:f9:2c:9b
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
index 04debd105e73a844a747f389c5e347905ac6f78f..9610386bb6f1658e96886829fbd2b46c8107500a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-4:
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: GP2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
   bios:
+    release_date: 09/06/2013
     vendor: Dell Inc.
     version: 2.1
-    release_date: 09/06/2013
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: GP2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.4
-      mac: 78:45:c4:f9:2c:c2
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:c0
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:2c:c1
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.4
-      driver: ixgbe
       mac: a0:36:9f:0e:35:a0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:35:a2
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:c0
       management: false
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  main_memory:
-    ram_size: 68719476736
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:2c:c1
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
index 9af6ea7669a3a2ac757ecd1a1a0d9cb443ebd895..04aa294fd0b888cdbd92500d236afe2bb9317e8a 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: CQ2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:ca
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:cb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.5
-      driver: ixgbe
       mac: a0:36:9f:0e:2e:c4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:2e:c6
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:16:ca
       management: false
-    bmc:
-      ip: 172.17.192.5
-      mac: 78:45:c4:f9:16:cc
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:16:cb
+      management: false
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  main_memory:
-    ram_size: 68719476736
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  chassis:
-    serial: CQ2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
+      size: 2000398934016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
index daba9cd953c978b8bce72ba24ec291548beba966..55762978fa71272f1b80b3598a87aca649492bd4 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-6:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
   bios:
+    release_date: 09/06/2013
     vendor: Dell Inc.
     version: 2.1
-    release_date: 09/06/2013
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
   chassis:
-    serial: DQ2YG5J
     manufacturer: Dell Inc.
     name: PowerEdge C6220
+    serial: DQ2YG5J
   main_memory:
-    ram_size: 68719476736
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:14:35
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.6
-      driver: ixgbe
       mac: a0:36:9f:0e:a4:90
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:0e:a4:92
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 78:45:c4:f9:14:35
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 78:45:c4:f9:14:36
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:a4:92
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.6
-      mac: 78:45:c4:f9:14:37
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
index d421bd3fb72894b122a1a90fd999da6f22df58d5..d3a25afefe546cb921908d83e8a656392196eb77 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-7:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: FQ2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:c4
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.7
-      driver: ixgbe
       mac: a0:36:9f:0e:24:a8
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:0e:24:aa
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 78:45:c4:f9:16:c4
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 78:45:c4:f9:16:c5
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:aa
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.192.7
-      mac: 78:45:c4:f9:16:c6
-  main_memory:
-    ram_size: 68719476736
-  chassis:
-    serial: FQ2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
   storage_devices:
     sda:
       device: sda
-      size: 2000398934016
       model: WDC WD2003FYYS-1
       rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
index c2f4e889a875832200c3897599d19c292104da7c..f7cc0a1710bd82400091c5bfeaa070b098c8485d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-8:
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 16
-    platform_type: x86_64
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: GQ2YG5J
+  main_memory:
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.8
-      mac: 78:45:c4:f9:16:c0
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:16:be
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.8
-      driver: ixgbe
       mac: a0:36:9f:0e:24:8c
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:0e:24:8e
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: 78:45:c4:f9:16:be
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: 78:45:c4:f9:16:bf
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:0e:24:8e
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-  main_memory:
-    ram_size: 68719476736
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial: GQ2YG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
diff --git a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
index f591a7caaa55bcc2a6aed8075fc31e8a6b8e811a..abc50eee85c980922691be835999eab0abb312ea 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -1,73 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 econome-9:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220
+    serial: F9GYG5J
   main_memory:
-    ram_size: 68719476736
-  storage_devices:
-    sda:
-      device: sda
-      size: 2000398934016
-      model: WDC WD2003FYYS-1
-      rev: 1.0
+    ram_size: 67645734912
   network_adapters:
-    bmc:
-      ip: 172.17.192.9
-      mac: 78:45:c4:f9:15:cc
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:ca
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: 78:45:c4:f9:15:cb
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.192.9
-      driver: ixgbe
       mac: a0:36:9f:0e:36:34
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:0e:36:36
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:ca
       management: false
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: 78:45:c4:f9:15:cb
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: WDC WD2003FYYS-1
+      rev: 1.0
+      size: 2000398934016
   supported_job_types:
     virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  chassis:
-    serial: F9GYG5J
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
index 0bccfbe92caf8a5ceed02caaec48d238392f50a9..046126c04f5b72ab95450425e62b247533460286 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043915P
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:96
-      ip6: fe80::d685:64ff:fe45:b596
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.1
+      mac: d4:85:64:45:b5:96
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:97
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:7c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:7d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:d1
-      ip: 172.17.160.1
-  chassis:
-    serial: GB8043915P
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-10.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
index 58f0ca3cdea738a2adfcc6dbc0d736ea864a1c9b..c7c3046ae9827f6884060a83905cd16b32b7e0b0 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043918S
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:ca
-      ip6: fe80::d685:64ff:fe45:b5aa
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.10
+      mac: d4:85:64:45:d5:ca
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:cb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:e2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:e3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:f1
-      ip: 172.17.160.10
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB8043918S
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
index 36be49ab5181e278010135f206d7c5e569c5162d..57864f1b877c52e20d598c96b59501ebae45d54b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-12:
+  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: GB804391F0
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:85:30
-      ip6: fe80::d685:64ff:fe45:8530
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.12
+      mac: d4:85:64:45:85:30
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:85:31
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:85:3c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:85:3d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:c9
-      ip: stremi-pdu
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  chassis:
-    serial: GB804391F0
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-13.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
index 1afe140f08c0d98669856f193181aa79fca0cb74..c428cc4fbb7381098cfabdea7bbeba7cddf2a920 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-13:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390R1
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:e5:1c
-      ip6: fe80::d685:64ff:fe45:e51c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.13
+      mac: d4:85:64:45:e5:1c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:e5:1d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:f8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:f9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:f6
-      ip: 172.17.160.13
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390R1
-    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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
index 32de86c9c337fadf44f85cda1ab2f5707acd9f87..e0dd79cc17f9ef127d94e687b704e2e8ce1503e7 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 03/01/2012
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: T421NP0071
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 44:1e:a1:53:8d:70
-      ip6: fe80::461e:a1ff:fe53:8d70
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.14
+      mac: 44:1e:a1:53:8d:70
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 44:1e:a1:53:8d:71
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: 44:1e:a1:53:8d:72
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 44:1e:a1:53:8d:73
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: e8:39:35:af:48:14
-      ip: 172.17.160.14
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: T421NP0071
-    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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
index c7f151fe80911bae416392d12baa1be4b1ea8058..ca64ccfed2b836cd48c85ac6cf7f73f37e582758 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390W8
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:65:08
-      ip6: fe80::d685:64ff:fe45:6508
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.15
+      mac: d4:85:64:45:65:08
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:09
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:74
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:75
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:67
-      ip: 172.17.160.15
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390W8
-    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/reims/clusters/stremi/nodes/stremi-16.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
index c9810e93cad8c8db1471de4c8cefd14a7bbc8bdc..e6da77104563907f4dc75f1ef71b0fd79e672398 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-16:
+  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: GB804390VM
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:75:b2
-      ip6: fe80::d685:64ff:fe45:75b2
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.16
+      mac: d4:85:64:45:75:b2
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:75:b3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:c0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:c1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:fa
-      ip: 172.17.160.16
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390VM
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
index 2a310b6893e05f7e05e109162e8f86c1372e4621..31d4244e1aabdea06f4a1276697bdec5f03afa2b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-17:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB80439150
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:6e:14:10
-      ip6: fe80::1ec1:deff:fe6e:1410
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.17
+      mac: 1c:c1:de:6e:14:10
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:6e:14:11
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:6e:14:0e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:6e:14:0f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:f1:f0
-      ip: 172.17.160.17
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB80439150
-    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/reims/clusters/stremi/nodes/stremi-18.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
index 2fc20cd9d142e5a42d9605138812676af2d8f833..7d1c185f04e04c9c37280134d04ba7a0d8b6dfa9 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-18:
+  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: GB804390T7
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:b7:9c
-      ip6: fe80::d685:64ff:fe44:b79c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.18
+      mac: d4:85:64:44:b7:9c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:b7:9d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:b7:a2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:b7:a3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:7d
-      ip: 172.17.160.18
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390T7
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  main_memory:
-    ram_size: 49392123904
-  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-19.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
index 64a220e72d6a7facc71cce8adf6892ea3759fa5a..452f6ab4c366bda96985bfb5e1db43e102c85ce6 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-19:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390TR
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:6e
-      ip6: fe80::d685:64ff:fe45:b56e
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.19
+      mac: d4:85:64:45:b5:6e
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:6f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:fc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:fd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:33
-      ip: 172.17.160.19
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390TR
-    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-2.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
index 1264a66e135fffde57a20fb4f226e718594406bb..b59215819bfe75c481e0fe908789a5f2e3fa67b4 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390S8
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:94
-      ip6: fe80::d685:64ff:fe45:794
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.2
+      mac: d4:85:64:45:07:94
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:95
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:82
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:83
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:8b
-      ip: 172.17.160.2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390S8
-    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/reims/clusters/stremi/nodes/stremi-20.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
index eef23ddeeec382c0424c13e56c91558a713033d1..774cd99d42aa0dbd573c7889af5fc46a1d8c49ef 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-20:
+  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: GB80439168
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:eb:38:a2
-      ip6: fe80::1ec1:deff:feeb:38a2
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.20
+      mac: 1c:c1:de:eb:38:a2
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:eb:38:a3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:eb:38:7a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:eb:38:7b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:87:41
-      ip: 172.17.160.20
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB80439168
-    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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
index ae80c518487116ec7ae926047c51f5c9b26049b1..efabb9d491945fe6e8e35c6b4463ddce40611840 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-21:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390YT
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:fe
-      ip6: fe80::d685:64ff:fe45:d5fe
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.21
+      mac: d4:85:64:45:d5:fe
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:ff
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:fc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:fd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:46:05
-      ip: 172.17.160.21
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390YT
-    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-23.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
index 7110e9e42bd88aded32ea749899c16854084e328..01bf07d3d02153a2142d87526c70229767d0781b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-23:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390JC
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:20
-      ip6: fe80::d685:64ff:fe45:720
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.23
+      mac: d4:85:64:45:07:20
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:21
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:56
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:57
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:45
-      ip: 172.17.160.23
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  chassis:
-    serial: GB804390JC
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-24.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
index 0e913d27ab8dba4000946f661e0b02f8be0e84c2..37b835069f923d7df038c911ee289b5952f0ef30 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-24:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390HC
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:f6:9e
-      ip6: fe80::d685:64ff:fe45:f69e
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.24
+      mac: d4:85:64:45:f6:9e
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:f6:9f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:f6:9c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:f6:9d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:d7
-      ip: 172.17.160.24
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390HC
-    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/reims/clusters/stremi/nodes/stremi-25.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
index b7f3e4e6692bdf86164c3e028ed8a0008ee8f097..d6b53ae5395dee793a1641bbffc5e5f1551fc1a2 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-25:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390RP
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:aa
-      ip6: fe80::d685:64ff:fe45:b5aa
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.25
+      mac: d4:85:64:45:b5:aa
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:ab
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:a8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:a9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:e8
-      ip: 172.17.160.25
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390RP
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-26.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
index 7219fa140faaa46e47de9f287ddb5399a888a388..fdcb7de3c872e6ef420d1eb9234604820fde863e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-26:
+  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: GB804391C4
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:a5:44
-      ip6: fe80::d685:64ff:fe45:a544
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.26
+      mac: d4:85:64:45:a5:44
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:45
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:48
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:49
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:17
-      ip: 172.17.160.26
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  chassis:
-    serial: GB804391C4
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-27.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
index 71409e980f8f726aa5c8ba4f7d2acc6f8faea738..54b61da719c07ce3d9ac870fa368d17d34bcb7af 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043917X
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:e8:2b:0c
-      ip6: fe80::1ec1:deff:fee8:2b0c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.27
+      mac: 1c:c1:de:e8:2b:0c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:e8:2b:0d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:e8:2b:12
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:e8:2b:13
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac:
-      ip: 172.17.160.27
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB8043917X
-    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-28.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
index 44026a0430153c1bb39e02951722653e3444cd27..3bb9fc802ea4efe9d45ba101c0cde946945aa35b 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB80439174
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:55:f0
-      ip6: fe80::d685:64ff:fe45:55f0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.28
+      mac: d4:85:64:45:55:f0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:55:f1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:55:b6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:55:b7
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:12
-      ip: 172.17.160.28
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB80439174
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-29.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
index 39800a0f06b173ac57d8a7a3854e7f965e231f6e..45964903718880a6ce261a9bb13c37a575ff75b7 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-29:
+  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: GB8043912D
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:f2:f2
-      ip6: fe80::7ae7:d1ff:fefa:f2f2
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.29
+      mac: 78:e7:d1:fa:f2:f2
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:fa:f2:f3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:fa:03:50
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:fa:03:51
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:f7:09:93
-      ip: 172.17.160.29
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB8043912D
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-3.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
index 22bdd8c8ed66af8c5a50839b49ee5a7c0626c80e..33793fa54c7246268f09ebced7dc0a24ca378246 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390XD
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:77:4a
-      ip6: fe80::d685:64ff:fe44:774a
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.3
+      mac: d4:85:64:44:77:4a
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:77:4b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:77:48
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:77:49
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:46:2d
-      ip: 172.17.160.3
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390XD
-    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/reims/clusters/stremi/nodes/stremi-31.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
index 8a9e76082f62de07e695f29b511f3733038582e4..2a6ca816f4c3fa2c30d90d0b9883a8da92b0fbe1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-31:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043910P
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:e5:ce
-      ip6: fe80::d685:64ff:fe45:e5ce
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.31
+      mac: d4:85:64:45:e5:ce
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:e5:cf
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:e5:ca
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:e5:cb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:be
-      ip: 172.17.160.31
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB8043910P
-    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-32.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
index 214ee16e61822b5b2d1d939618976935cbf2daf2..05cbf694e5b2301eecae96e746a127e787c737d2 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-32:
+  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: GB804390V1
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:d0
-      ip6: fe80::d685:64ff:fe45:c5d0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.32
+      mac: d4:85:64:45:c5:d0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:d1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:0e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:0f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:1d
-      ip: 172.17.160.32
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390V1
-    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/reims/clusters/stremi/nodes/stremi-33.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
index dfbb8e19f237b8423dcb22f426f2f49b5979aca7..09b8fbbccb4c6b8e1723a8057774533745850abd 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-33:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043912Y
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 1c:c1:de:e8:fa:84
-      ip6: fe80::1ec1:deff:fee8:fa84
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.33
+      mac: 1c:c1:de:e8:fa:84
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:e8:fa:85
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:e8:fa:88
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 1c:c1:de:e8:fa:89
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:12:03
-      ip: 172.17.160.33
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB8043912Y
-    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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
index 6f55dfdc171ffeeff45b4924ccc4099ec8b27a4e..c8797c0c53937b910559984289f623f138af7109 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-34:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043911H
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:65:fa
-      ip6: fe80::d685:64ff:fe45:65fa
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.34
+      mac: d4:85:64:45:65:fa
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:fb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:f0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:f1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:88
-      ip: 172.17.160.34
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB8043911H
-    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-35.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
index 6f0298f40aa46606d40a26b0c60c53fea6b60a7d..4dd6778a81bfac9c390ec48eb2469d723fb6ef14 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-35:
+  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: GB804390SR
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:a0
-      ip6: fe80::d685:64ff:fe45:c5a0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.35
+      mac: d4:85:64:45:c5:a0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:a1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:8e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:8f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:db
-      ip: 172.17.160.35
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390SR
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-36.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
index ca89f113b9dfa6fd8175b8180f5a08d6e1cabfba..b6beb1578134dc8fcce0a3c3ff83d67e1d5b7c45 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-36:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: VB0250EAVER
-      device: sda
-      size: 250059350016
-      rev: HPG0
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804391DA
+  main_memory:
+    ram_size: 46170898432
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:c4
-      ip6: fe80::d685:64ff:fe45:7c4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.36
+      mac: d4:85:64:45:07:c4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:c5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:c2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:c3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:58
-      ip: 172.17.160.36
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804391DA
-    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: 47244640256
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
index 4749444e98e9d608439b37366bb33756538f06c0..8223e380ca570448c7968da9dc211a460cfbf2e5 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-39:
+  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: GB804390N3
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:07:a6
-      ip6: fe80::d685:64ff:fe45:7a6
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.39
+      mac: d4:85:64:45:07:a6
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:a7
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:1e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:07:1f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:d1
-      ip: 172.17.160.39
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390N3
-    manufacturer: HP
-    name: ProLiant DL165 G7
-  main_memory:
-    ram_size: 49392123904
-  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-4.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
index debcffb5bea96e9840ed335a7300e416975ebff2..4cfbbd1b9f8efd25505585b436f89d84a0295b78 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804391AS
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:c5:d4
-      ip6: fe80::d685:64ff:fe45:c5d4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.4
+      mac: d4:85:64:45:c5:d4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:d5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:c8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:c5:c9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:1a
-      ip: 172.17.160.4
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  chassis:
-    serial: GB804391AS
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-40.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
index bf12b8b33418b128bf66ba0f3ca6eb8d451e90be..87bcfd77a8db1c0f8cf53e09db9fb0369056477e 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-40:
+  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: GB804391DP
+  main_memory:
+    ram_size: 48318382080
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:17:d6
-      ip6: fe80::d685:64ff:fe45:17d6
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.40
+      mac: d4:85:64:45:17:d6
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:17:d7
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:17:c8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:17:c9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:30
-      ip: 172.17.160.40
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804391DP
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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: 49392123904
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 24
diff --git a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
index f86e86c1fc7c8b853948e3bcbe9ed5462bfef35e..7ba14caf17b4e37f6cfa672dcfe2162cadb9b991 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-41:
+  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: GB804390P1
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:77:28
-      ip6: fe80::d685:64ff:fe44:7728
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.41
+      mac: d4:85:64:44:77:28
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:77:29
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:77:24
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:77:25
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:46:2f
-      ip: 172.17.160.41
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390P1
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-42.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
index dd5f071b6c91d042367cf3c95ef2709d1dd946f6..2d70557850fa81acadb41fee0d26d4c5d7204f01 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-42:
+  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: GB804391A2
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:44:c7:8e
-      ip6: fe80::d685:64ff:fe44:c78e
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.42
+      mac: d4:85:64:44:c7:8e
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:c7:8f
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:b7:9a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:44:b7:9b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:c4
-      ip: 172.17.160.42
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804391A2
-    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-43.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
index 7854dc7a17580e810bbfddace10a3288ed094fa6..a189a36efdfa1b65e7e32e03054dc06db2d8ca5d 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-43:
+  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: GB804390L2
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:fc
-      ip6: fe80::d685:64ff:fe45:b5fc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.43
+      mac: d4:85:64:45:b5:fc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:fd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:ee
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:ef
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:16:eb
-      ip: 172.17.160.43
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390L2
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-44.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
index 3ba2fa2556505e94daf1fdede971616325fa73c4..0e07dd85c2587eafafc23304b4f956b24d5ce0ea 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-44:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB8043919A
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:17:ce
-      ip6: fe80::d685:64ff:fe45:17ce
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.44
+      mac: d4:85:64:45:17:ce
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:17:cf
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:17:cc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:17:cd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:db
-      ip: 172.17.160.44
-  chassis:
-    serial: GB8043919A
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-5.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
index b4dd532a64152019e8263480d0ff36cf8c394488..5cf9f9880721b870b7f795f64d19385dbb4f33dd 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390PM
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:d5:12
-      ip6: fe80::d685:64ff:fe45:d512
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.5
+      mac: d4:85:64:45:d5:12
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:13
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:50
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:d5:51
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:40
-      ip: 172.17.160.5
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390PM
-    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-6.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
index cc91e0fb4502f3af2f66297988b223f1cbf41164..f55c31d1eb5a259c0f0d76f7f91907c6dbe58287 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804390XX
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:f5:26
-      ip6: fe80::d685:64ff:fe45:b5aa
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.6
+      mac: d4:85:64:45:f5:26
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:f5:27
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:e5:f8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:e5:f9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:36:ca
-      ip: 172.17.160.6
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804390XX
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-7.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
index 3a5babd64973bf5a86e44658382b1724592c172b..b6d802f0bf777ec2eaa243d202867fb3c47f09d9 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB804391EK
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:95:4c
-      ip6: fe80::d685:64ff:fe45:954c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.7
+      mac: d4:85:64:45:95:4c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:95:4d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:95:4a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:95:4b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:e5
-      ip: 172.17.160.7
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: GB804391EK
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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/reims/clusters/stremi/nodes/stremi-8.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
index 1771a21ba3ebe8f78bd3acb3108f9aa8f2c7be0b..84eb4c968240e2b7ea8edbb20b6470360713dce1 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-8:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 24
   bios:
-    version: O37
     release_date: 01/26/2011
     vendor: HP
-  storage_devices:
-    sda:
-      model: GB0250EAFYK
-      device: sda
-      size: 250059350016
-      rev: HPG2
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB80439116
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:65:de
-      ip6: fe80::d685:64ff:fe45:65de
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.8
+      mac: d4:85:64:45:65:de
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:df
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:82
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:65:83
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:64
-      ip: 172.17.160.8
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB80439116
-    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-9.yaml b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
index 3d46f0547881f0dfdce94d336bd64b83a23c4f3e..27047821d86690370de6c488cd0238ba56754269 100644
--- a/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
+++ b/input/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.yaml
@@ -1,78 +1,52 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 stremi-9:
+  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: GB804390M4
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:85:32
-      ip6: fe80::d685:64ff:fe45:8532
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.160.9
+      mac: d4:85:64:45:85:32
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:85:33
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth2:
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:85:c0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:85:c1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7b:26:b3
-      ip: 172.17.160.9
+      mounted: false
   storage_devices:
     sda:
-      model: GB0250EAFYK
       device: sda
-      size: 250059350016
+      model: GB0250EAFYK
       rev: HPG2
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB804390M4
-    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/stremi_diff.yaml b/input/grid5000/sites/reims/clusters/stremi/stremi_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..34a2b851652af101ed222fbae9052e44bd54298f
--- /dev/null
+++ b/input/grid5000/sites/reims/clusters/stremi/stremi_diff.yaml
@@ -0,0 +1,383 @@
+---
+nodes:
+  stremi-[1-44]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        mountable: false
+      eth3:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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
+
+  stremi-1:
+    chassis:
+      serial: GB8043915P
+    network_adapters:
+      bmc:
+        ip: 172.17.160.1
+        mac: 1c:c1:de:7b:16:d1
+      eth0:
+        ip6: fe80::d685:64ff:fe45:b596
+  stremi-10:
+    chassis:
+      serial: GB8043918S
+    network_adapters:
+      bmc:
+        ip: 172.17.160.10
+        mac: 1c:c1:de:7b:36:f1
+      eth0:
+        ip6: fe80::d685:64ff:fe45:b5aa
+  stremi-12:
+    chassis:
+      serial: GB804391F0
+    network_adapters:
+      bmc:
+        ip: stremi-pdu
+        mac: 1c:c1:de:7b:26:c9
+      eth0:
+        ip6: fe80::d685:64ff:fe45:8530
+  stremi-13:
+    chassis:
+      serial: GB804390R1
+    network_adapters:
+      bmc:
+        ip: 172.17.160.13
+        mac: 1c:c1:de:7b:36:f6
+      eth0:
+        ip6: fe80::d685:64ff:fe45:e51c
+  stremi-14:
+    chassis:
+      serial: T421NP0071
+    network_adapters:
+      bmc:
+        ip: 172.17.160.14
+        mac: e8:39:35:af:48:14
+      eth0:
+        ip6: fe80::461e:a1ff:fe53:8d70
+  stremi-15:
+    chassis:
+      serial: GB804390W8
+    network_adapters:
+      bmc:
+        ip: 172.17.160.15
+        mac: 1c:c1:de:7b:26:67
+      eth0:
+        ip6: fe80::d685:64ff:fe45:6508
+  stremi-16:
+    chassis:
+      serial: GB804390VM
+    network_adapters:
+      bmc:
+        ip: 172.17.160.16
+        mac: 1c:c1:de:7b:16:fa
+      eth0:
+        ip6: fe80::d685:64ff:fe45:75b2
+  stremi-17:
+    chassis:
+      serial: GB80439150
+    network_adapters:
+      bmc:
+        ip: 172.17.160.17
+        mac: 1c:c1:de:7a:f1:f0
+      eth0:
+        ip6: fe80::1ec1:deff:fe6e:1410
+  stremi-18:
+    chassis:
+      serial: GB804390T7
+    network_adapters:
+      bmc:
+        ip: 172.17.160.18
+        mac: 1c:c1:de:7b:36:7d
+      eth0:
+        ip6: fe80::d685:64ff:fe44:b79c
+  stremi-19:
+    chassis:
+      serial: GB804390TR
+    network_adapters:
+      bmc:
+        ip: 172.17.160.19
+        mac: 1c:c1:de:7b:36:33
+      eth0:
+        ip6: fe80::d685:64ff:fe45:b56e
+  stremi-2:
+    chassis:
+      serial: GB804390S8
+    network_adapters:
+      bmc:
+        ip: 172.17.160.2
+        mac: 1c:c1:de:7b:36:8b
+      eth0:
+        ip6: fe80::d685:64ff:fe45:794
+  stremi-20:
+    chassis:
+      serial: GB80439168
+    network_adapters:
+      bmc:
+        ip: 172.17.160.20
+        mac: 1c:c1:de:7a:87:41
+      eth0:
+        ip6: fe80::1ec1:deff:feeb:38a2
+  stremi-21:
+    chassis:
+      serial: GB804390YT
+    network_adapters:
+      bmc:
+        ip: 172.17.160.21
+        mac: 1c:c1:de:7b:46:05
+      eth0:
+        ip6: fe80::d685:64ff:fe45:d5fe
+  stremi-23:
+    chassis:
+      serial: GB804390JC
+    network_adapters:
+      bmc:
+        ip: 172.17.160.23
+        mac: 1c:c1:de:7b:36:45
+      eth0:
+        ip6: fe80::d685:64ff:fe45:720
+  stremi-24:
+    chassis:
+      serial: GB804390HC
+    network_adapters:
+      bmc:
+        ip: 172.17.160.24
+        mac: 1c:c1:de:7b:26:d7
+      eth0:
+        ip6: fe80::d685:64ff:fe45:f69e
+  stremi-25:
+    chassis:
+      serial: GB804390RP
+    network_adapters:
+      bmc:
+        ip: 172.17.160.25
+        mac: 1c:c1:de:7b:16:e8
+      eth0:
+        ip6: fe80::d685:64ff:fe45:b5aa
+  stremi-26:
+    chassis:
+      serial: GB804391C4
+    network_adapters:
+      bmc:
+        ip: 172.17.160.26
+        mac: 1c:c1:de:7b:36:17
+      eth0:
+        ip6: fe80::d685:64ff:fe45:a544
+  stremi-27:
+    chassis:
+      serial: GB8043917X
+    network_adapters:
+      bmc:
+        ip: 172.17.160.27
+        mac: 
+      eth0:
+        ip6: fe80::1ec1:deff:fee8:2b0c
+  stremi-28:
+    chassis:
+      serial: GB80439174
+    network_adapters:
+      bmc:
+        ip: 172.17.160.28
+        mac: 1c:c1:de:7b:26:12
+      eth0:
+        ip6: fe80::d685:64ff:fe45:55f0
+  stremi-29:
+    chassis:
+      serial: GB8043912D
+    network_adapters:
+      bmc:
+        ip: 172.17.160.29
+        mac: 78:e7:d1:f7:09:93
+      eth0:
+        ip6: fe80::7ae7:d1ff:fefa:f2f2
+  stremi-3:
+    chassis:
+      serial: GB804390XD
+    network_adapters:
+      bmc:
+        ip: 172.17.160.3
+        mac: 1c:c1:de:7b:46:2d
+      eth0:
+        ip6: fe80::d685:64ff:fe44:774a
+  stremi-31:
+    chassis:
+      serial: GB8043910P
+    network_adapters:
+      bmc:
+        ip: 172.17.160.31
+        mac: 1c:c1:de:7b:36:be
+      eth0:
+        ip6: fe80::d685:64ff:fe45:e5ce
+  stremi-32:
+    chassis:
+      serial: GB804390V1
+    network_adapters:
+      bmc:
+        ip: 172.17.160.32
+        mac: 1c:c1:de:7b:26:1d
+      eth0:
+        ip6: fe80::d685:64ff:fe45:c5d0
+  stremi-33:
+    chassis:
+      serial: GB8043912Y
+    network_adapters:
+      bmc:
+        ip: 172.17.160.33
+        mac: 1c:c1:de:7a:12:03
+      eth0:
+        ip6: fe80::1ec1:deff:fee8:fa84
+  stremi-34:
+    chassis:
+      serial: GB8043911H
+    network_adapters:
+      bmc:
+        ip: 172.17.160.34
+        mac: 1c:c1:de:7b:26:88
+      eth0:
+        ip6: fe80::d685:64ff:fe45:65fa
+  stremi-35:
+    chassis:
+      serial: GB804390SR
+    network_adapters:
+      bmc:
+        ip: 172.17.160.35
+        mac: 1c:c1:de:7b:16:db
+      eth0:
+        ip6: fe80::d685:64ff:fe45:c5a0
+  stremi-36:
+    chassis:
+      serial: GB804391DA
+    network_adapters:
+      bmc:
+        ip: 172.17.160.36
+        mac: 1c:c1:de:7b:36:58
+      eth0:
+        ip6: fe80::d685:64ff:fe45:7c4
+  stremi-39:
+    chassis:
+      serial: GB804390N3
+    network_adapters:
+      bmc:
+        ip: 172.17.160.39
+        mac: 1c:c1:de:7b:26:d1
+      eth0:
+        ip6: fe80::d685:64ff:fe45:7a6
+  stremi-4:
+    chassis:
+      serial: GB804391AS
+    network_adapters:
+      bmc:
+        ip: 172.17.160.4
+        mac: 1c:c1:de:7b:26:1a
+      eth0:
+        ip6: fe80::d685:64ff:fe45:c5d4
+  stremi-40:
+    chassis:
+      serial: GB804391DP
+    network_adapters:
+      bmc:
+        ip: 172.17.160.40
+        mac: 1c:c1:de:7b:26:30
+      eth0:
+        ip6: fe80::d685:64ff:fe45:17d6
+  stremi-41:
+    chassis:
+      serial: GB804390P1
+    network_adapters:
+      bmc:
+        ip: 172.17.160.41
+        mac: 1c:c1:de:7b:46:2f
+      eth0:
+        ip6: fe80::d685:64ff:fe44:7728
+  stremi-42:
+    chassis:
+      serial: GB804391A2
+    network_adapters:
+      bmc:
+        ip: 172.17.160.42
+        mac: 1c:c1:de:7b:36:c4
+      eth0:
+        ip6: fe80::d685:64ff:fe44:c78e
+  stremi-43:
+    chassis:
+      serial: GB804390L2
+    network_adapters:
+      bmc:
+        ip: 172.17.160.43
+        mac: 1c:c1:de:7b:16:eb
+      eth0:
+        ip6: fe80::d685:64ff:fe45:b5fc
+  stremi-44:
+    chassis:
+      serial: GB8043919A
+    network_adapters:
+      bmc:
+        ip: 172.17.160.44
+        mac: 1c:c1:de:7b:26:db
+      eth0:
+        ip6: fe80::d685:64ff:fe45:17ce
+  stremi-5:
+    chassis:
+      serial: GB804390PM
+    network_adapters:
+      bmc:
+        ip: 172.17.160.5
+        mac: 1c:c1:de:7b:26:40
+      eth0:
+        ip6: fe80::d685:64ff:fe45:d512
+  stremi-6:
+    chassis:
+      serial: GB804390XX
+    network_adapters:
+      bmc:
+        ip: 172.17.160.6
+        mac: 1c:c1:de:7b:36:ca
+      eth0:
+        ip6: fe80::d685:64ff:fe45:b5aa
+  stremi-7:
+    chassis:
+      serial: GB804391EK
+    network_adapters:
+      bmc:
+        ip: 172.17.160.7
+        mac: 1c:c1:de:7b:26:e5
+      eth0:
+        ip6: fe80::d685:64ff:fe45:954c
+  stremi-8:
+    chassis:
+      serial: GB80439116
+    network_adapters:
+      bmc:
+        ip: 172.17.160.8
+        mac: 1c:c1:de:7b:26:64
+      eth0:
+        ip6: fe80::d685:64ff:fe45:65de
+  stremi-9:
+    chassis:
+      serial: GB804390M4
+    network_adapters:
+      bmc:
+        ip: 172.17.160.9
+        mac: 1c:c1:de:7b:26:b3
+      eth0:
+        ip6: fe80::d685:64ff:fe45:8532
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
index 633f65e2ca1734e4b26baea70b2fca35e5180b29..f763bbc5b10d762f7de360cd28c8812d62c641ad 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -1,94 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 20
   bios:
+    release_date: 09/06/2013
     vendor: Dell Inc.
     version: 2.1
-    release_date: 09/06/2013
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220 II
+    serial: 9N20LZ1
+  main_memory:
+    ram_size: 135291469824
+  network_adapters:
+    eth0:
+      driver: ixgbe
+      interface: Ethernet
+      ip: 172.16.100.1
+      mac: a0:36:9f:28:a6:d0
+      management: false
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:28:a6:d2
+      management: false
+      mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:73:cf:45
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:73:cf:46
+      management: false
+      mounted: false
   storage_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
+    sda:
+      device: sda
       model: WD6001BKHG
       rev: D1S6
-    sdd:
-      device: sdd
       size: 600127266816
+    sdb:
+      device: sdb
       model: WD6001BKHG
       rev: D1S6
-    sde:
-      device: sde
       size: 600127266816
+    sdc:
+      device: sdc
       model: WD6001BKHG
       rev: D1S6
-    sda:
-      device: sda
       size: 600127266816
+    sdd:
+      device: sdd
       model: WD6001BKHG
       rev: D1S6
-    sdb:
-      device: sdb
       size: 600127266816
+    sde:
+      device: sde
       model: WD6001BKHG
       rev: D1S6
-  main_memory:
-    ram_size: 137438953472
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  chassis:
-    serial: 9N20LZ1
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220 II
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:45
-      rate: 1000000000
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:46
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.1
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:d0
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:d2
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.1
-      mac: f0:4d:a2:73:cf:47
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
index 2f5bc87a6fae1ac7c15fcf5d7b84ad4d1beaa2e2..71fd747a7415700c89c00dd40ce46ac121e3d53c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -1,93 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-2:
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 20
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220 II
+    serial: DB12LZ1
+  main_memory:
+    ram_size: 135291469824
+  network_adapters:
+    eth0:
+      driver: ixgbe
+      interface: Ethernet
+      ip: 172.16.100.2
+      mac: a0:36:9f:28:a8:80
+      management: false
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:28:a8:82
+      management: false
+      mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:73:cc:78
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:73:cc:79
+      management: false
+      mounted: false
   storage_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
+    sda:
+      device: sda
       model: WD6001BKHG
       rev: D1S6
-    sdd:
-      device: sdd
       size: 600127266816
+    sdb:
+      device: sdb
       model: WD6001BKHG
       rev: D1S6
-    sda:
-      device: sda
       size: 600127266816
+    sdc:
+      device: sdc
       model: WD6001BKHG
       rev: D1S6
-    sdb:
-      device: sdb
       size: 600127266816
+    sdd:
+      device: sdd
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  network_adapters:
-    bmc:
-      ip: 172.17.100.2
-      mac: f0:4d:a2:73:cc:7a
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:78
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:79
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.100.2
-      driver: ixgbe
-      mac: a0:36:9f:28:a8:80
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
-      management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a8:82
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
-  chassis:
-    serial: DB12LZ1
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220 II
-  main_memory:
-    ram_size: 137438953472
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
index 21dedae15e7f06e40e9e7f493998c5197b999cd5..8b895adaf95f32fcd789e9f298067e03ac935124 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -1,94 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-3:
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 20
-    platform_type: x86_64
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
   chassis:
-    serial: 9PJ4LZ1
     manufacturer: Dell Inc.
     name: PowerEdge C6220 II
+    serial: 9PJ4LZ1
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    bmc:
-      ip: 172.17.100.3
-      mac: f0:4d:a2:74:06:b8
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:74:06:b6
-      rate: 1000000000
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:74:06:b7
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.100.3
-      driver: ixgbe
       mac: a0:36:9f:28:a6:d4
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:28:a6:d6
-      enabled: false
-      mountable: false
+      management: false
       mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:74:06:b6
       management: false
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  supported_job_types:
-    virtual: ivt
+      mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:74:06:b7
+      management: false
+      mounted: false
   storage_devices:
+    sda:
+      device: sda
+      model: WD6002BKTG
+      rev: D1P3
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: WD6001BKHG
+      rev: D1S6
+      size: 600127266816
     sdc:
       device: sdc
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdd:
       device: sdd
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6002BKTG
-      rev: D1P3
-    sdb:
-      device: sdb
       size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
index 5a144daba35f99dec96344cb0eabddd64253dc64..b06cab91ea0591cf6926174fd2d6e50f04ff648d 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -1,93 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 20
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220 II
+    serial: BVY4LZ1
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cf:2a
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.100.4
-      driver: ixgbe
       mac: a0:36:9f:28:a6:b0
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:28:a6:b2
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: f0:4d:a2:73:cf:2a
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: f0:4d:a2:73:cf:2b
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a6:b2
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.4
-      mac: f0:4d:a2:73:cf:2c
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  chassis:
-    serial: BVY4LZ1
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220 II
-  main_memory:
-    ram_size: 137438953472
   storage_devices:
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6002BKTG
-      rev: D1P3
     sda:
       device: sda
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdc:
       device: sdc
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdd:
       device: sdd
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
+      size: 600127266816
+    sde:
+      device: sde
+      model: WD6002BKTG
+      rev: D1P3
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
index d03744b941dcdb0f9733c0c63fd3af8994e129c2..64b94aece0d14799feed0034a70ab3457fbb70da 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -1,93 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 20
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220 II
+    serial: 9912LZ1
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    bmc:
-      ip: 172.17.100.5
-      mac: f0:4d:a2:73:cc:71
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:6f
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:cc:70
-      enabled: false
-      mountable: false
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.100.5
-      driver: ixgbe
       mac: a0:36:9f:28:a7:b8
-      rate: 10000000000
-      enabled: true
-      mountable: true
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: a0:36:9f:28:a7:ba
-      enabled: false
-      mountable: false
+      management: false
+      mounted: false
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:73:cc:6f
+      management: false
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: f0:4d:a2:73:cc:70
       management: false
-  main_memory:
-    ram_size: 137438953472
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
+      mounted: false
   storage_devices:
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
     sda:
       device: sda
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdc:
       device: sdc
+      model: WD6001BKHG
+      rev: D1S6
       size: 600127266816
+    sdd:
+      device: sdd
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 9912LZ1
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220 II
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
index 846e0de1f899b7df0e206ef75ad9556c3afc0b1a..66177df3bff59944b4cc4cc6c2bdc8acc4809e80 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -1,93 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-6:
-  main_memory:
-    ram_size: 137438953472
-  chassis:
-    serial: 8TY4LZ1
-    manufacturer: Dell Inc.
-    name: PowerEdge C6220 II
   architecture:
+    platform_type: x86_64
     smp_size: 2
     smt_size: 20
-    platform_type: x86_64
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge C6220 II
+    serial: 8TY4LZ1
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ce:22
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.100.6
-      driver: ixgbe
       mac: a0:36:9f:28:a7:b4
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:28:a7:b6
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: f0:4d:a2:73:ce:22
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: f0:4d:a2:73:ce:23
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a7:b6
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.6
-      mac: f0:4d:a2:73:ce:24
   storage_devices:
-    sdb:
-      device: sdb
-      size: 600127266816
+    sda:
+      device: sda
       model: WD6001BKHG
       rev: D1S6
-    sdd:
-      device: sdd
       size: 600127266816
+    sdb:
+      device: sdb
       model: WD6001BKHG
       rev: D1S6
-    sda:
-      device: sda
       size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
     sdc:
       device: sdc
+      model: WD6001BKHG
+      rev: D1S6
       size: 600127266816
+    sdd:
+      device: sdd
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
index f318469574f434e5a49f9b40f821cda5171d95f2..9a61685a754541ea3716215294655305682ad55f 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -1,93 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 20
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
   chassis:
-    serial: 5M20LZ1
     manufacturer: Dell Inc.
     name: PowerEdge C6220 II
-  supported_job_types:
-    virtual: ivt
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
+    serial: 5M20LZ1
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.100.7
-      driver: ixgbe
       mac: a0:36:9f:28:a9:14
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:28:a9:16
       management: false
+      mounted: false
     eth2:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: f0:4d:a2:73:ca:ad
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: f0:4d:a2:73:ca:ae
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a9:16
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-    bmc:
-      ip: 172.17.100.7
-      mac: f0:4d:a2:73:ca:af
   storage_devices:
+    sda:
+      device: sda
+      model: WD6001BKHG
+      rev: D1S6
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sdc:
       device: sdc
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
-    sda:
-      device: sda
       size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
     sdd:
       device: sdd
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: WD6001BKHG
       rev: D1S6
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  main_memory:
-    ram_size: 137438953472
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
index f2fa290dec1967e7be0b9f751750fbc3af775feb..0f61b0ce3b5ae1b22118a011fa3448440323537e 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -1,93 +1,72 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paranoia-8:
-  storage_devices:
-    sdd:
-      device: sdd
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sde:
-      device: sde
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sda:
-      device: sda
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdb:
-      device: sdb
-      size: 600127266816
-      model: WD6001BKHG
-      rev: D1S6
-    sdc:
-      device: sdc
-      size: 600127266816
-      model: WD6002BKTG
-      rev: D1P3
-  processor:
-    clock_speed: 2200000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2660 v2
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 26214400
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 20
+  bios:
+    release_date: 09/06/2013
+    vendor: Dell Inc.
+    version: 2.1
   chassis:
-    serial: D14YKZ1
     manufacturer: Dell Inc.
     name: PowerEdge C6220 II
-  supported_job_types:
-    virtual: ivt
+    serial: D14YKZ1
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    bmc:
-      ip: 172.17.100.8
-      mac: f0:4d:a2:73:ce:3f
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: f0:4d:a2:73:ce:3d
-      enabled: false
-      #mountable: false #TODO
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.100.8
-      driver: ixgbe
       mac: a0:36:9f:28:a9:18
-      rate: 10000000000
-      enabled: true
-      mountable: true
+      management: false
       mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
+      interface: Ethernet
+      mac: a0:36:9f:28:a9:1a
       management: false
-    eth3:
+      mounted: false
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: f0:4d:a2:73:ce:3d
+      management: false
+      mounted: false
+    eth3:
       driver: igb
+      interface: Ethernet
       mac: f0:4d:a2:73:ce:3e
-      enabled: false
-      mountable: false
-      mounted: false
       management: false
-    eth1:
-      interface: Ethernet
-      driver: ixgbe
-      mac: a0:36:9f:28:a9:1a
-      enabled: false
-      mountable: false
       mounted: false
-      management: false
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    vendor: Dell Inc.
-    version: 2.1
-    release_date: 09/06/2013
-  architecture:
-    smp_size: 2
-    smt_size: 20
-    platform_type: x86_64
+  storage_devices:
+    sda:
+      device: sda
+      model: WD6001BKHG
+      rev: D1S6
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: WD6001BKHG
+      rev: D1S6
+      size: 600127266816
+    sdc:
+      device: sdc
+      model: WD6002BKTG
+      rev: D1P3
+      size: 600127266816
+    sdd:
+      device: sdd
+      model: WD6001BKHG
+      rev: D1S6
+      size: 600127266816
+    sde:
+      device: sde
+      model: WD6001BKHG
+      rev: D1S6
+      size: 600127266816
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia_diff.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..868203f000fc71b0dceb8ee8680387709b6c8bb7
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia_diff.yaml
@@ -0,0 +1,81 @@
+---
+nodes:
+
+  paranoia-[1-8]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      eth2:
+        enabled: false
+        rate: 1000000000
+      eth3:
+        enabled: false
+        mountable: false
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 26214400
+      clock_speed: 2200000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2660 v2 @ 2.20GHz
+      vendor: Intel
+      version: E5-2660 v2
+
+  paranoia-1:
+    chassis:
+      serial: 9N20LZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.1
+        mac: f0:4d:a2:73:cf:47
+  paranoia-2:
+    chassis:
+      serial: DB12LZ1
+  paranoia-3:
+    chassis:
+      serial: 9PJ4LZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.3
+        mac: f0:4d:a2:74:06:b8
+  paranoia-4:
+    chassis:
+      serial: BVY4LZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.4
+        mac: f0:4d:a2:73:cf:2c
+  paranoia-5:
+    chassis:
+      serial: 9912LZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.5
+        mac: f0:4d:a2:73:cc:71
+  paranoia-6:
+    chassis:
+      serial: 8TY4LZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.6
+        mac: f0:4d:a2:73:ce:24
+  paranoia-7:
+    chassis:
+      serial: 5M20LZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.7
+        mac: f0:4d:a2:73:ca:af
+  paranoia-8:
+    chassis:
+      serial: D14YKZ1
+    network_adapters:
+      bmc:
+        ip: 172.17.100.8
+        mac: f0:4d:a2:73:ce:3f
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
index c28d60fd00aef9a57b13a4c510641e259a019c45..748db7266ffae15d180c88296c3cf65995ddff81 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -1,90 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF04D
+  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:9e:ad
-      rate: 20000000000
-      ip6: fe80::203:ba00:100:9ead
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.98.1
-      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:9e:ae
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:97:0e
-      ip: 172.17.98.1
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:97:0c
-      ip6: fe80::214:4fff:feca:970c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.98.1
+      mac: 00:14:4f:ca:97:0c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 00:14:4f:ca:97:0d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 0935XEF04D
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
-  block_device:
+      mounted: false
+  storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
index 01b23f8244894a611aec51c4392d807646804b80..7e9d6355a56663750c84c338ea6edf11980c2a52 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-10:
+  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: 0935XEF046
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.10
+      mac: 00:14:4f:ca:98:4c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:98:4d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:45
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.10
       ip6: fe80::203:ba00:100:6d45
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.10
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:98:4e
-      ip: 172.17.98.10
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:46
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:98:4c
-      ip6: fe80::214:4fff:feca:984c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.10
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:98:4d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC5A
-  chassis:
-    serial: 0935XEF046
-    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
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
index ca69ab1cefe1b5811c983e2744200629f7f56074..df546a2c8fa73f1f5ab23047850e124a7e43c37b 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.yaml
@@ -1,90 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF055
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.11
+      mac: 00:14:4f:ca:9a:e0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:9a:e1
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:75
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.11
       ip6: fe80::203:ba00:100:9475
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.11
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:76
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:9a:e2
-      ip: 172.17.98.11
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:9a:e0
-      ip6: fe80::214:4fff:feca:9ae0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.11
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:9a:e1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 0935XEF055
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
-  block_device:
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
+      rev: AC4A
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
index 47816766a232256722e3e8fef6f869877c600ecb..7bd799362ebb060725a1371bf122778e1af3676a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-12:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF042
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.12
+      mac: 00:14:4f:ca:99:24
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:99:25
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:55
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.12
       ip6: fe80::203:ba00:100:9f55
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.12
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:56
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:26
-      ip: 172.17.98.12
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:24
-      ip6: fe80::214:4fff:feca:9924
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.12
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:99:25
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF042
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
index 6d7b813cdaf67605ac716955b2de59ab2f9bd0d0..247b081041722fda712a12a890177f6b2afef296 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-13:
+  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: 0935XEF059
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.13
+      mac: 00:14:4f:ca:9a:80
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:9a:81
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:61
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.13
       ip6: fe80::203:ba00:100:9461
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.13
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:62
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:9a:82
-      ip: 172.17.98.13
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:9a:80
-      ip6: fe80::214:4fff:feca:9a80
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.13
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:9a:81
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC5A
+      size: 500107862016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 0935XEF059
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
index d74be8dd4a5fa02452226357471d692cd9d2560c..29f4eb1bc18d0e2531054ef3d5eef2d36c0a8095 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.yaml
@@ -1,90 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF058
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.15
+      mac: 00:14:4f:ca:8f:00
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:8f:01
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:e9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.15
       ip6: fe80::203:ba00:100:94e9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.15
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:8f:02
-      ip: 172.17.98.15
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:ea
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:8f:00
-      ip6: fe80::214:4fff:feca:8f00
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.15
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:8f:01
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF058
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
index 48ce8da69f631e0862ffdbb884ceee10bb06b96e..cb2b7d9455c1646ba5cb00ff21619ed7ae2c41d3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-16:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF04F
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.16
+      mac: 00:14:4f:ca:94:b4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:94:b5
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:aa:d9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.16
       ip6: fe80::203:ba00:100:aad9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.16
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:aa:da
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:94:b6
-      ip: 172.17.98.16
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:94:b4
-      ip6: fe80::214:4fff:feca:94b4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.16
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:94:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF04F
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC4A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
index 179ddbe4016329878d31fb494bba5d63af8bc929..2269219e0e6054284b05985b2304db0cd108a109 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-17:
+  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: 0935XEF048
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.17
+      mac: 00:14:4f:ca:98:6c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:98:6d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:59
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.17
       ip6: fe80::203:ba00:100:9459
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.17
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:98:6e
-      ip: 172.17.98.17
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:5a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:98:6c
-      ip6: fe80::221:28ff:fe40:3c3a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.17
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:98:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC4A
-  chassis:
-    serial: 0935XEF048
-    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
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
index 032e8caa733d6ed8570e49e08441a7bd332dbaae..c25719941b11e6ac283b490644c30794dada9da7 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-18:
+  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: 0935XEF044
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.18
+      mac: 00:14:4f:ca:99:a8
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:99:a9
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:e9
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.18
       ip6: fe80::203:ba00:100:9ee9
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.18
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:99:aa
-      ip: 172.17.98.18
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ea
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:a8
-      ip6: fe80::214:4fff:feca:99a8
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.18
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:99:a9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC5A
-  chassis:
-    serial: 0935XEF044
-    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
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
index faa6cc8b4f8ee04667a6bfd6e1518919f08b3d02..aa86257b1ddb7228e5ff41d2e7eeac166e897cba 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-19:
+  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: 0935XEF04E
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.19
+      mac: 00:21:28:40:3c:3a
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:21:28:40:3c:3b
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:67:39
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.19
       ip6: fe80::203:ba00:100:6739
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.19
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:21:28:40:3c:3c
-      ip: 172.17.98.19
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:67:3a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:21:28:40:3c:3a
-      ip6: fe80::221:28ff:fe40:3c3a
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.19
-    eth1:
       mounted: false
-      mac: 00:21:28:40:3c:3b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC5A
-  chassis:
-    serial: 0935XEF04E
-    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
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
index 724227430a6526c1264e5a25f68d0981336c3562..43ff391a73bd5d1e07f5f016f9b5fdd95b90d86c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -1,90 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-2:
+  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: 0935XEF052
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.2
+      mac: 00:14:4f:ca:99:7c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:99:7d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:71
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.2
       ip6: fe80::203:ba00:100:9471
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.2
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:72
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:7e
-      ip: 172.17.98.2
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:7c
-      ip6: fe80::214:4fff:feca:997c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.2
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:99:7d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC5A
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 500107862016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 0935XEF052
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
-  block_device:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
index f49ab2e9536cdb0caee2139bece415e00273d817..bcb6333833cbf7e52eb572374217d086233ae93f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-20:
+  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: 0935XEF053
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.20
+      mac: 00:14:4f:ca:92:2c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:92:2d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.20
       ip6: fe80::203:ba00:100:9fe5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.20
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:e6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:2e
-      ip: 172.17.98.20
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:2c
-      ip6: fe80::214:4fff:feca:922c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.20
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:92:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC4A
+      size: 500107862016
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 0935XEF053
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
index f396c4383b27a4338b7691898d0586ae87a62156..7f9384b46edd91393312de5decf4609aa62a6ada 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-21:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF049
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.21
+      mac: 00:14:4f:ca:4d:78
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:4d:79
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:c5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.21
       ip6: fe80::203:ba00:100:abc5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.21
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:4d:7a
-      ip: 172.17.98.21
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:c6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:4d:78
-      ip6: fe80::214:4fff:feca:4d78
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.21
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:4d:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF049
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
index 2ff6ed268d029cb6cf5fe958b8928fb0a179ed8c..764db87cb11f407d0cc08a083f545afe16584b0c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-23:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF057
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.23
+      mac: 00:14:4f:ca:99:dc
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:99:dd
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:99
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.23
       ip6: fe80::203:ba00:100:ab99
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.23
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:ab:9a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:99:de
-      ip: 172.17.98.23
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:99:dc
-      ip6: fe80::214:4fff:feca:99dc
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.23
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:99:dd
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 0935XEF057
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
+      rev: AC4A
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
index 01e258cb3769dffbbaddb83e0b4e46304d191c8a..7558a55dd2ab50fbb2115a0648c55114653f4e7f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-24:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF056
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.24
+      mac: 00:14:4f:ca:92:38
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:92:39
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:fd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.24
       ip6: fe80::203:ba00:100:94fd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.24
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:92:3a
-      ip: 172.17.98.24
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:fe
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:38
-      ip6: fe80::214:4fff:feca:9238
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.24
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:92:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 0935XEF056
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
+      rev: AC4A
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
index 39089888fdc2a6cc927063722edebfe8a562d91c..50bbf1b782b7b4da4aa162d1633e9d0500102c9c 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -1,90 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-25:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF04C
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.25
+      mac: 00:14:4f:ca:91:60
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:91:61
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:49
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.25
       ip6: fe80::203:ba00:100:9f49
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.25
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:4a
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:91:62
-      ip: 172.17.98.25
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:91:60
-      ip6: fe80::214:4fff:feca:9160
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.25
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:91:61
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF04C
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  block_device:
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
+      rev: AC4A
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
index af30d6a2fba60729cad795f91d09f1ca878eb0db..552bea4f8c99e6dd7f6b7f6ec10a6ac3492825dd 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-3:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF041
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.3
+      mac: 00:14:4f:ca:92:6c
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:92:6d
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:dd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.3
       ip6: fe80::203:ba00:100:9edd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.3
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:de
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:6e
-      ip: 172.17.98.3
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:6c
-      ip6: fe80::214:4fff:feca:926c
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.3
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:92:6d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF041
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
index d4c9ee4144bc153186bd77dd150cbafe2842abaf..71015a66317babd884799e3570524b829f9e6f37 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-4:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF047
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.4
+      mac: 00:14:4f:ca:97:78
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:97:79
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b5
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.4
       ip6: fe80::203:ba00:100:69b5
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.4
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:97:7a
-      ip: 172.17.98.4
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:69:b6
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:97:78
-      ip6: fe80::214:4fff:feca:9778
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.4
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:97:79
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF047
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
index 500b8a4ceab121bbac917c3bf6849e0614cbda58..5c7cd0b109f29f402cb0fa0c60c430ca45e92a0a 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF051
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.5
+      mac: 00:14:4f:ca:94:70
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:94:71
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:a1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.5
       ip6: fe80::203:ba00:100:6da1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.5
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:6d:a2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:94:72
-      ip: 172.17.98.5
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:94:70
-      ip6: fe80::214:4fff:feca:9470
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.5
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:94:71
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF051
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
+      rev: AC4A
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
index faeb3770f3598de0da5fb741d2cea986ebddb47e..abb34d989ac3dfe7e7c3e5bf1d26524ae0279ca0 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF04B
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.6
+      mac: 00:14:4f:ca:92:30
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:92:31
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:bd
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.6
       ip6: fe80::203:ba00:100:9fbd
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.6
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9f:be
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:32
-      ip: 172.17.98.6
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:30
-      ip6: fe80::214:4fff:feca:9230
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.6
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:92:31
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF04B
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  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
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
index 20101df3065b15a2d8e80b5a80f57c44120ab251..30db3eb58a336d5b1ca05c1123d98a6a011cdbb1 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC4A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF050
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.7
+      mac: 00:14:4f:ca:a7:28
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:a7:29
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:80:f1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.7
       ip6: fe80::203:ba00:100:80f1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.7
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:a7:2a
-      ip: 172.17.98.7
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:80:f2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:a7:28
-      ip6: fe80::214:4fff:feca:a728
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.7
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:a7:29
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: 0935XEF050
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  supported_job_types:
-    virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
+      rev: AC4A
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
index d529df783993416c4399ba797a7051f65cb07cdf..13ca2c7405d80279ea267fe1c042ba9ee915f51e 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-8:
+  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: 0935XEF045
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.8
+      mac: 00:14:4f:ca:92:b4
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:92:b5
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:55
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.8
       ip6: fe80::203:ba00:100:9455
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.8
-      driver: mlx4_core
-      mountable: true
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:94:56
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 00:14:4f:ca:92:b6
-      ip: 172.17.98.8
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:92:b4
-      ip6: fe80::214:4fff:feca:92b4
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.8
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:92:b5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: HITACHI HUA7250S
       device: sda
-      size: 500107862016
+      model: HITACHI HUA7250S
       rev: AC5A
-  chassis:
-    serial: 0935XEF045
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
+      size: 500107862016
   supported_job_types:
     virtual: ivt
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      size: '976773168'
-      rev: AC5A
-      vendor: ATA
diff --git a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
index 6f40e07cced7819dec00d2d9361141367ee9862b..ff781c93c269159614e29b51712d77ef0847f8b6 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -1,86 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapide-9:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 8
   bios:
-    version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  storage_devices:
-    sda:
-      model: HITACHI HUA7250S
-      device: sda
-      size: 500107862016
-      rev: AC5A
+    version: 1.14
+  chassis:
+    manufacturer: Sun Microsystems
+    name: SUN FIRE X2270
+    serial: 0935XEF04A
+  main_memory:
+    ram_size: 25769803776
   network_adapters:
-    ib0:
+    eth0:
+      driver: igb
+      interface: Ethernet
+      ip: 172.16.98.9
+      mac: 00:14:4f:ca:98:a0
+      management: false
       mounted: true
+      rate: 1000000000
+    eth1:
+      driver: igb
+      interface: Ethernet
+      mac: 00:14:4f:ca:98:a1
+      management: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:b1
-      rate: 20000000000
+      interface: InfiniBand
+      ip: 172.18.98.9
       ip6: fe80::203:ba00:100:9eb1
       management: false
-      enabled: true
-      interface: InfiniBand
+      mounted: true
+      rate: 20000000000
       version: MT25418
-      ip: 172.18.98.9
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 00:14:4f:ca:98:a2
-      ip: 172.17.98.9
     ib1:
-      mounted: false
+      driver: mlx4_core
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:b2
-      rate: 10000000000
-      management: false
-      enabled: false
       interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:14:4f:ca:98:a0
-      ip6: fe80::214:4fff:feca:98a0
       management: false
-      enabled: true
-      interface: Ethernet
-      driver: igb
-      mountable: true
-      ip: 172.16.98.9
-    eth1:
       mounted: false
-      mac: 00:14:4f:ca:98:a1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  supported_job_types:
-    virtual: ivt
-  chassis:
-    serial: 0935XEF04A
-    manufacturer: Sun Microsystems
-    name: SUN FIRE X2270
-  main_memory:
-    ram_size: 25769803776
-  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
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
+      device: sda
       model: HITACHI HUA7250S
-      size: '976773168'
       rev: AC5A
-      vendor: ATA
+      size: 500107862016
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide_diff.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6d1db9a95854d4b9d1956322b3af507918d25d34
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/parapide/parapide_diff.yaml
@@ -0,0 +1,262 @@
+---
+nodes:
+  parapide-[-]:
+    chassis:
+      serial: 0935XEF04D
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+      ib0:
+        driver: mlx4_core
+        enabled: true
+        interface: InfiniBand
+        management: false
+        mountable: true
+        mounted: true
+        rate: 20000000000
+        version: MT25418
+      ib1:
+        driver: mlx4_core
+        enabled: false
+        interface: InfiniBand
+        management: false
+        mountable: false
+        mounted: false
+        rate: 10000000000
+        version: MT25418
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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:
+        vendor: ATA
+
+  parapide-1:
+    chassis:
+      serial: 0935XEF04D
+    network_adapters:
+      bmc:
+        ip: 172.17.98.1
+        mac: 00:14:4f:ca:97:0e
+      eth0:
+        ip6: fe80::214:4fff:feca:970c
+      ib0:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ad
+        ip: 172.18.98.1
+        ip6: fe80::203:ba00:100:9ead
+      ib1:
+        guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:03:ba:00:01:00:9e:ae
+  parapide-10:
+    chassis:
+      serial: 0935XEF046
+    network_adapters:
+      bmc:
+        ip: 172.17.98.10
+        mac: 00:14:4f:ca:98:4e
+      eth0:
+        ip6: fe80::214:4fff:feca:984c
+  parapide-11:
+    chassis:
+      serial: 0935XEF055
+    network_adapters:
+      bmc:
+        ip: 172.17.98.11
+        mac: 00:14:4f:ca:9a:e2
+      eth0:
+        ip6: fe80::214:4fff:feca:9ae0
+  parapide-12:
+    chassis:
+      serial: 0935XEF042
+    network_adapters:
+      bmc:
+        ip: 172.17.98.12
+        mac: 00:14:4f:ca:99:26
+      eth0:
+        ip6: fe80::214:4fff:feca:9924
+  parapide-13:
+    chassis:
+      serial: 0935XEF059
+    network_adapters:
+      bmc:
+        ip: 172.17.98.13
+        mac: 00:14:4f:ca:9a:82
+      eth0:
+        ip6: fe80::214:4fff:feca:9a80
+  parapide-15:
+    chassis:
+      serial: 0935XEF058
+    network_adapters:
+      bmc:
+        ip: 172.17.98.15
+        mac: 00:14:4f:ca:8f:02
+      eth0:
+        ip6: fe80::214:4fff:feca:8f00
+  parapide-16:
+    chassis:
+      serial: 0935XEF04F
+    network_adapters:
+      bmc:
+        ip: 172.17.98.16
+        mac: 00:14:4f:ca:94:b6
+      eth0:
+        ip6: fe80::214:4fff:feca:94b4
+  parapide-17:
+    chassis:
+      serial: 0935XEF048
+    network_adapters:
+      bmc:
+        ip: 172.17.98.17
+        mac: 00:14:4f:ca:98:6e
+      eth0:
+        ip6: fe80::221:28ff:fe40:3c3a
+  parapide-18:
+    chassis:
+      serial: 0935XEF044
+    network_adapters:
+      bmc:
+        ip: 172.17.98.18
+        mac: 00:14:4f:ca:99:aa
+      eth0:
+        ip6: fe80::214:4fff:feca:99a8
+  parapide-19:
+    chassis:
+      serial: 0935XEF04E
+    network_adapters:
+      bmc:
+        ip: 172.17.98.19
+        mac: 00:21:28:40:3c:3c
+      eth0:
+        ip6: fe80::221:28ff:fe40:3c3a
+  parapide-2:
+    chassis:
+      serial: 0935XEF052
+    network_adapters:
+      bmc:
+        ip: 172.17.98.2
+        mac: 00:14:4f:ca:99:7e
+      eth0:
+        ip6: fe80::214:4fff:feca:997c
+  parapide-20:
+    chassis:
+      serial: 0935XEF053
+    network_adapters:
+      bmc:
+        ip: 172.17.98.20
+        mac: 00:14:4f:ca:92:2e
+      eth0:
+        ip6: fe80::214:4fff:feca:922c
+  parapide-21:
+    chassis:
+      serial: 0935XEF049
+    network_adapters:
+      bmc:
+        ip: 172.17.98.21
+        mac: 00:14:4f:ca:4d:7a
+      eth0:
+        ip6: fe80::214:4fff:feca:4d78
+  parapide-23:
+    chassis:
+      serial: 0935XEF057
+    network_adapters:
+      bmc:
+        ip: 172.17.98.23
+        mac: 00:14:4f:ca:99:de
+      eth0:
+        ip6: fe80::214:4fff:feca:99dc
+  parapide-24:
+    chassis:
+      serial: 0935XEF056
+    network_adapters:
+      bmc:
+        ip: 172.17.98.24
+        mac: 00:14:4f:ca:92:3a
+      eth0:
+        ip6: fe80::214:4fff:feca:9238
+  parapide-25:
+    chassis:
+      serial: 0935XEF04C
+    network_adapters:
+      bmc:
+        ip: 172.17.98.25
+        mac: 00:14:4f:ca:91:62
+      eth0:
+        ip6: fe80::214:4fff:feca:9160
+  parapide-3:
+    chassis:
+      serial: 0935XEF041
+    network_adapters:
+      bmc:
+        ip: 172.17.98.3
+        mac: 00:14:4f:ca:92:6e
+      eth0:
+        ip6: fe80::214:4fff:feca:926c
+  parapide-4:
+    chassis:
+      serial: 0935XEF047
+    network_adapters:
+      bmc:
+        ip: 172.17.98.4
+        mac: 00:14:4f:ca:97:7a
+      eth0:
+        ip6: fe80::214:4fff:feca:9778
+  parapide-5:
+    chassis:
+      serial: 0935XEF051
+    network_adapters:
+      bmc:
+        ip: 172.17.98.5
+        mac: 00:14:4f:ca:94:72
+      eth0:
+        ip6: fe80::214:4fff:feca:9470
+  parapide-6:
+    chassis:
+      serial: 0935XEF04B
+    network_adapters:
+      bmc:
+        ip: 172.17.98.6
+        mac: 00:14:4f:ca:92:32
+      eth0:
+        ip6: fe80::214:4fff:feca:9230
+  parapide-7:
+    chassis:
+      serial: 0935XEF050
+    network_adapters:
+      bmc:
+        ip: 172.17.98.7
+        mac: 00:14:4f:ca:a7:2a
+      eth0:
+        ip6: fe80::214:4fff:feca:a728
+  parapide-8:
+    chassis:
+      serial: 0935XEF045
+    network_adapters:
+      bmc:
+        ip: 172.17.98.8
+        mac: 00:14:4f:ca:92:b6
+      eth0:
+        ip6: fe80::214:4fff:feca:92b4
+  parapide-9:
+    chassis:
+      serial: 0935XEF04A
+    network_adapters:
+      bmc:
+        ip: 172.17.98.9
+        mac: 00:14:4f:ca:98:a2
+      eth0:
+        ip6: fe80::214:4fff:feca:98a0
diff --git a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
index 58e78f0375022d6170e0e9d02b8d08bf1f3e7914..0e6a7eecff1ebef229d3a041b310923e21c2bd90 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-1:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG2
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651KY
+  main_memory:
+    ram_size: 50465865728
   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:0f
-      rate: 20000000000
-      ip6: fe80::202:c903:6:ba0f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.1
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:23
-      ip: 172.17.99.1
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:10
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:ef:22
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:ef:23
-      ip6: fe80::7ae7:d1ff:fef5:ef23
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.1
+      mac: 78:e7:d1:f5:ef:23
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:3f:30
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:3f:31
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: GB803651KY
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:0f
+      interface: InfiniBand
+      ip: 172.18.99.1
+      ip6: fe80::202:c903:6:ba0f
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:ba:10
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: GB0250EAFYK
+      rev: HPG2
+      size: 250059350016
   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-11.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
index 16fe8d9062d8e9632891a3195d52512a17566fca..4120a2f91288805d13934d9c21b7ec4456bc18f9 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-11:
+  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: GB803651L5
+  main_memory:
+    ram_size: 50465865728
   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:b9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93b9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.11
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:6e
-      ip: 172.17.99.11
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ba
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:ee:f2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:ee:f3
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.11
+      mac: 78:e7:d1:f5:ee:f3
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:df:ac
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:df:ad
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:b9
+      interface: InfiniBand
+      ip: 172.18.99.11
+      ip6: fe80::223:7dff:ff94:93b9
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ba
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651L5
-    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-12.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
index 7a4a9d2fc10569328fb86aaea687d8ac78e96a37..6d4243f309322f3a11f89e211883a33c858be0bb 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-12:
+  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: GB803651MC
+  main_memory:
+    ram_size: 50465865728
   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:61
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a261
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.12
-      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:62
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:f7:09:43
-      ip: 172.17.99.12
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:c8
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:4e:c9
-      ip6: fe80::7ae7:d1ff:fef9:4ec9
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.12
+      mac: 78:e7:d1:f9:4e:c9
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:d2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:d3
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:61
+      interface: InfiniBand
+      ip: 172.18.99.12
+      ip6: fe80::223:7dff:ff94:a261
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:62
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651MC
-    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-13.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
index 2a194f4ff1bf8b08883f24837247419b055840e6..28c097a6b297a501538f2dd1dd17374bb47abb10 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-13:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651MP
+  main_memory:
+    ram_size: 50465865728
   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:69
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:f269
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.13
-      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:f2:6a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:a1
-      ip: 172.17.99.13
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:7e:f0
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:7e:f1
-      ip6: fe80::7ae7:d1ff:fef9:7ef1
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.13
+      mac: 78:e7:d1:f9:7e:f1
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:7e:f4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:7e:f5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: GB803651MP
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:69
+      interface: InfiniBand
+      ip: 172.18.99.13
+      ip6: fe80::223:7dff:ff94:f269
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:6a
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   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-15.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
index b4957766fa07857a293f4d4a994b3beddcd697d3..85d4ce846fd05d4f694b9cb479006355c3dade1d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-15:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651LD
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:75
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7275
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.15
-      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:72:76
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:99:f6
-      ip: 172.17.99.15
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:4f:04
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:4f:05
-      ip6: fe80::7ae7:d1ff:fef5:4f05
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.15
+      mac: 78:e7:d1:f5:4f:05
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:0f:be
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:0f:bf
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: GB803651LD
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:75
+      interface: InfiniBand
+      ip: 172.18.99.15
+      ip6: fe80::223:7dff:ff94:7275
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:72:76
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   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-16.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
index 02383a4148f7bbc964cceafefe51b807b245af5f..57fa5ca24778ba23ed7f20f814286954c71d15cf 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-16:
+  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: GB803651P6
+  main_memory:
+    ram_size: 50465865728
   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:51
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d351
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.16
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:f7:09:78
-      ip: 172.17.99.16
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:52
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:fa:03:78
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:fa:03:79
-      ip6: fe80::7ae7:d1ff:fefa:379
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.16
+      mac: 78:e7:d1:fa:03:79
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:fa:03:5a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:fa:03:5b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:51
+      interface: InfiniBand
+      ip: 172.18.99.16
+      ip6: fe80::223:7dff:ff94:d351
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:52
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651P6
-    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-19.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
index 15b53468e28bce087f222a31a7a2ac672be24ab5..1b1a8c86677a6c700316a96448a9fe07175a2a32 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-19:
+  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: GB803651JB
+  main_memory:
+    ram_size: 50465865728
   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:1d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d31d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.19
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 1c:c1:de:7b:36:2e
-      ip: 172.17.99.19
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:b5:36
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:45:b5:37
-      ip6: fe80::d685:64ff:fe45:b537
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.19
+      mac: d4:85:64:45:b5:37
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:f4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:45:a5:f5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1d
+      interface: InfiniBand
+      ip: 172.18.99.19
+      ip6: fe80::223:7dff:ff94:d31d
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1e
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
-  chassis:
-    serial: GB803651JB
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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-2.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
index 6b7899a079b8347c068c595a0dbb3cbeee346990..70da59abfde94ad2d410aca2ff22b1cbaf4f10a5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-2:
+  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: GB803651JH
+  main_memory:
+    ram_size: 50465865728
   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:c9
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:93c9
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.2
-      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:ca
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:58:23:dd
-      ip: 172.17.99.2
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:a2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:a3
-      ip6: fe80::dad3:85ff:fee6:a5a3
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.2
+      mac: d8:d3:85:e6:a5:a3
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:c4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:c5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:c9
+      interface: InfiniBand
+      ip: 172.18.99.2
+      ip6: fe80::223:7dff:ff94:93c9
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:93:ca
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
-  chassis:
-    serial: GB803651JH
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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-20.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
index c1df3d34c3dcd4c078cf2985bf0f3d447d3edecb..f99589ff5df66927169b103525e0342741d8a133 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-20:
+  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: GB803651J7
+  main_memory:
+    ram_size: 50465865728
   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:19
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d319
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.20
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:27
-      ip: 172.17.99.20
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:fe:98
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:fe:99
-      ip6: fe80::7ae7:d1ff:fef5:fe99
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.20
+      mac: 78:e7:d1:f5:fe:99
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:ef:42
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:ef:43
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:19
+      interface: InfiniBand
+      ip: 172.18.99.20
+      ip6: fe80::223:7dff:ff94:d319
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:1a
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651J7
-    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-21.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
index 16b50461a370292d4aec5df7e978962fa1510af9..81f9e906d6c3e72c6bf36ca9de557f694902751f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-21:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651PW
+  main_memory:
+    ram_size: 50465865728
   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:35
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d335
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.21
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:3a
-      ip: 172.17.99.21
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:36
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:de:b4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:de:b5
-      ip6: fe80::7ae7:d1ff:fef5:deb5
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.21
+      mac: 78:e7:d1:f5:de:b5
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:df:80
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:df:81
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:35
+      interface: InfiniBand
+      ip: 172.18.99.21
+      ip6: fe80::223:7dff:ff94:d335
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:36
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651PW
-    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-22.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
index 012b272d88e1a6499c1aba64f06c7e3635d26382..a4396a37a6fbfff0d07f21bb57ce641a6d3c4ca7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-22:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651NB
+  main_memory:
+    ram_size: 50465865728
   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:fd
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:a2fd
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.22
-      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:fe
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 1c:c1:de:7a:ac:4d
-      ip: 172.17.99.22
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:43:5b:8c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d4:85:64:43:5b:8d
-      ip6: fe80::d685:64ff:fe43:5b8d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.22
+      mac: d4:85:64:43:5b:8d
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:43:5b:8a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d4:85:64:43:5b:8b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fd
+      interface: InfiniBand
+      ip: 172.18.99.22
+      ip6: fe80::223:7dff:ff94:a2fd
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:a2:fe
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651NB
-    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-25.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
index 3816bbf45561982bda5817ec14021ec277823c28..3e6e4d2a1157a4f8e6384d1199067da9a123c7a7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-25:
+  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: GB803651MV
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:3f
-      rate: 20000000000
-      ip6: fe80::202:c903:6:243f
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.25
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:4a
-      ip: 172.17.99.25
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:40
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:5e:28
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:5e:29
-      ip6: fe80::7ae7:d1ff:fef9:5e29
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.25
+      mac: 78:e7:d1:f9:5e:29
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:5e:32
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:5e:33
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:3f
+      interface: InfiniBand
+      ip: 172.18.99.25
+      ip6: fe80::202:c903:6:243f
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:06:24:40
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651MV
-    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-28.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
index 7d35bd09594d34fcf02f3674dded44cd1cb1ddc4..1db7f76fd9976c05a0993d211f47a16c8f5354e1 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-28:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651JD
+  main_memory:
+    ram_size: 50465865728
   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:e5
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:f2e5
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.28
-      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:f2:e6
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:c9:2d
-      ip: 172.17.99.28
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:52
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:53
-      ip6: fe80::7ae7:d1ff:fef9:8e53
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.28
+      mac: 78:e7:d1:f9:8e:53
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:4c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:4d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e5
+      interface: InfiniBand
+      ip: 172.18.99.28
+      ip6: fe80::223:7dff:ff94:f2e5
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:f2:e6
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651JD
-    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-31.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
index 6be5af72f67ea64209bdf1deb3686f024d751e89..0d8a72d6829871f242acb98cc1a5a3cd71a775e7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-31:
+  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: GB803651LJ
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:35
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:8235
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.31
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:b9:4e
-      ip: 172.17.99.31
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:36
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:be:38
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:be:39
-      ip6: fe80::7ae7:d1ff:fef9:be39
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.31
+      mac: 78:e7:d1:f9:be:39
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:be:3a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:be:3b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:35
+      interface: InfiniBand
+      ip: 172.18.99.31
+      ip6: fe80::223:7dff:ff94:8235
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:36
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
-  chassis:
-    serial: GB803651LJ
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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-32.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
index dff7d291a47a75a1c446bd767086ec16dab8641e..dd7401b65dc15f9da796b57fcbbc195853050cd6 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-32:
+  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: GB803651L9
+  main_memory:
+    ram_size: 50465865728
   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:59
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:7359
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.32
-      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:5a
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:58:23:fc
-      ip: 172.17.99.32
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:6c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: d8:d3:85:e6:a5:6d
-      ip6: fe80::dad3:85ff:fee6:a56d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.32
+      mac: d8:d3:85:e6:a5:6d
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:4c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: d8:d3:85:e6:a5:4d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:59
+      interface: InfiniBand
+      ip: 172.18.99.32
+      ip6: fe80::223:7dff:ff94:7359
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:73:5a
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: GB803651L9
-    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-38.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
index 394fd1d60a20596138babb4ecc205152d3d6b825..01aac824260f78bac573ada5a759f4569f94a15c 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-38:
+  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: GB803651M7
+  main_memory:
+    ram_size: 50465865728
   network_adapters:
-    ib0:
-      mounted: true
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:21
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:8221
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.38
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:a9:0f
-      ip: 172.17.99.38
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:22
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:3f:5a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f5:3f:5b
-      ip6: fe80::7ae7:d1ff:fef5:3f5b
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.38
+      mac: 78:e7:d1:f5:3f:5b
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:fe:ee
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f5:fe:ef
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:21
+      interface: InfiniBand
+      ip: 172.18.99.38
+      ip6: fe80::223:7dff:ff94:8221
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:82:22
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
-  chassis:
-    serial: GB803651M7
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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-8.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
index f8016cfa7a140f806b2bd8c93f5082793ac89972..a7783cd089233bbe005532c208aa61cc520b56d5 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-8:
+  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
-      device: sda
-      size: 250059350016
-      rev: HPG0
-      vendor: ATA
+    version: O37
+  chassis:
+    manufacturer: HP
+    name: ProLiant DL165 G7
+    serial: GB803651MH
+  main_memory:
+    ram_size: 50465865728
   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:4d
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:b24d
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.8
-      driver: mlx4_core
-      mountable: true
-    bmc:
-      mac: 78:e7:d1:65:c9:56
-      ip: 172.17.99.8
-    ib1:
-      mounted: false
-      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:d6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:4e:d7
-      ip6: fe80::7ae7:d1ff:fef9:4ed7
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.8
+      mac: 78:e7:d1:f9:4e:d7
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:fa
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:4e:fb
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-  chassis:
-    serial: GB803651MH
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4d
+      interface: InfiniBand
+      ip: 172.18.99.8
+      ip6: fe80::223:7dff:ff94:b24d
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:b2:4e
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
+  storage_devices:
+    sda:
+      device: sda
+      model: VB0250EAVER
+      rev: HPG0
+      size: 250059350016
   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-9.yaml b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
index 8f8434eacc3d99261e81d3d6e651c371b75343e7..adba515bb0ba17b0ae6db3607ada35dd0484e78d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -1,98 +1,71 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parapluie-9:
+  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: GB803651P0
+  main_memory:
+    ram_size: 50465865728
   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:21
-      rate: 20000000000
-      ip6: fe80::223:7dff:ff94:d321
-      management: false
-      enabled: true
-      interface: InfiniBand
-      version: MT25418
-      ip: 172.18.99.9
-      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:22
-      rate: 10000000000
-      management: false
-      enabled: false
-      interface: InfiniBand
-      version: MT25418
-      driver: mlx4_core
-      mountable: false
-    bmc:
-      mac: 78:e7:d1:65:b9:e1
-      ip: 172.17.99.9
     eth0:
-      mounted: false
-      rate: 100000000
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:f6
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+      rate: 100000000
     eth1:
-      mounted: true
-      rate: 1000000000
-      mac: 78:e7:d1:f9:8e:f7
-      ip6: fe80::7ae7:d1ff:fef9:8ef7
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: igb
-      mountable: true
+      interface: Ethernet
       ip: 172.16.99.9
+      mac: 78:e7:d1:f9:8e:f7
+      management: false
+      mounted: true
+      rate: 1000000000
     eth2:
-      mounted: false
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:e4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
-    eth3:
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
       mac: 78:e7:d1:f9:8e:e5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: igb
-      mountable: false
+      mounted: false
+    ib0:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:21
+      interface: InfiniBand
+      ip: 172.18.99.9
+      ip6: fe80::223:7dff:ff94:d321
+      management: false
+      mounted: true
+      rate: 20000000000
+      version: MT25418
+    ib1:
+      driver: mlx4_core
+      guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:23:7d:ff:ff:94:d3:22
+      interface: InfiniBand
+      management: false
+      mounted: false
+      rate: 10000000000
+      version: MT25418
   storage_devices:
     sda:
-      model: VB0250EAVER
       device: sda
-      size: 250059350016
+      model: VB0250EAVER
       rev: HPG0
-      vendor: ATA
-  chassis:
-    serial: GB803651P0
-    manufacturer: HP
-    name: ProLiant DL165 G7
+      size: 250059350016
   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/parapluie_diff.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a87f3266c92980bdd4ffcfc707264fe245731722
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie_diff.yaml
@@ -0,0 +1,164 @@
+---
+nodes:
+  parapluie-1:
+    chassis:
+      serial: GB803651KY
+    network_adapters:
+      bmc:
+        ip: 172.17.99.1
+        mac: 78:e7:d1:65:a9:23
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef5:ef23
+  parapluie-11:
+    chassis:
+      serial: GB803651L5
+    network_adapters:
+      bmc:
+        ip: 172.17.99.11
+        mac: 78:e7:d1:65:a9:6e
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef5:fe99
+  parapluie-12:
+    chassis:
+      serial: GB803651MC
+    network_adapters:
+      bmc:
+        ip: 172.17.99.12
+        mac: 78:e7:d1:f7:09:43
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:4ec9
+  parapluie-13:
+    chassis:
+      serial: GB803651MP
+    network_adapters:
+      bmc:
+        ip: 172.17.99.13
+        mac: 78:e7:d1:65:b9:a1
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:7ef1
+  parapluie-15:
+    chassis:
+      serial: GB803651LD
+    network_adapters:
+      bmc:
+        ip: 172.17.99.15
+        mac: 78:e7:d1:65:99:f6
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef5:4f05
+  parapluie-16:
+    chassis:
+      serial: GB803651P6
+    network_adapters:
+      bmc:
+        ip: 172.17.99.16
+        mac: 78:e7:d1:f7:09:78
+      eth1:
+        ip6: fe80::7ae7:d1ff:fefa:379
+  parapluie-19:
+    chassis:
+      serial: GB803651JB
+    network_adapters:
+      bmc:
+        ip: 172.17.99.19
+        mac: 1c:c1:de:7b:36:2e
+      eth1:
+        ip6: fe80::d685:64ff:fe45:b537
+  parapluie-2:
+    chassis:
+      serial: GB803651JH
+    network_adapters:
+      bmc:
+        ip: 172.17.99.2
+        mac: 78:e7:d1:58:23:dd
+      eth1:
+        ip6: fe80::dad3:85ff:fee6:a5a3
+  parapluie-20:
+    chassis:
+      serial: GB803651J7
+    network_adapters:
+      bmc:
+        ip: 172.17.99.20
+        mac: 78:e7:d1:65:a9:27
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef5:fe99
+  parapluie-21:
+    chassis:
+      serial: GB803651PW
+    network_adapters:
+      bmc:
+        ip: 172.17.99.21
+        mac: 78:e7:d1:65:a9:3a
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef5:deb5
+  parapluie-22:
+    chassis:
+      serial: GB803651NB
+    network_adapters:
+      bmc:
+        ip: 172.17.99.22
+        mac: 1c:c1:de:7a:ac:4d
+      eth1:
+        ip6: fe80::d685:64ff:fe43:5b8d
+  parapluie-25:
+    chassis:
+      serial: GB803651MV
+    network_adapters:
+      bmc:
+        ip: 172.17.99.25
+        mac: 78:e7:d1:65:a9:4a
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:5e29
+  parapluie-28:
+    chassis:
+      serial: GB803651JD
+    network_adapters:
+      bmc:
+        ip: 172.17.99.28
+        mac: 78:e7:d1:65:c9:2d
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:8e53
+  parapluie-31:
+    chassis:
+      serial: GB803651LJ
+    network_adapters:
+      bmc:
+        ip: 172.17.99.31
+        mac: 78:e7:d1:65:b9:4e
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:be39
+  parapluie-32:
+    chassis:
+      serial: GB803651L9
+    network_adapters:
+      bmc:
+        ip: 172.17.99.32
+        mac: 78:e7:d1:58:23:fc
+      eth1:
+        ip6: fe80::dad3:85ff:fee6:a56d
+  parapluie-38:
+    chassis:
+      serial: GB803651M7
+    network_adapters:
+      bmc:
+        ip: 172.17.99.38
+        mac: 78:e7:d1:65:a9:0f
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef5:3f5b
+  parapluie-8:
+    chassis:
+      serial: GB803651MH
+    network_adapters:
+      bmc:
+        ip: 172.17.99.8
+        mac: 78:e7:d1:65:c9:56
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:4ed7
+  parapluie-9:
+    chassis:
+      serial: GB803651P0
+    network_adapters:
+      bmc:
+        ip: 172.17.99.9
+        mac: 78:e7:d1:65:b9:e1
+      eth1:
+        ip6: fe80::7ae7:d1ff:fef9:8ef7
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
index 6b2e0f66e677cd91e27c2960752554876cacda08..5d20f6a6b0cab6badc7f42f746829b30ea0d0c0f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-1:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 1GZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 1GZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.1
+      mac: ec:f4:bb:d0:f9:d8
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f9:dd
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f9:da
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f9:dc
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f9:dc
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f9:da
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.1
+      mac: ec:f4:bb:d0:f9:dd
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f9:d8
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
index 32172a7d429ce010b9190ea4b123c0fd1e8ed110..6d695d2d87a315a5f8d9ab9765f9ef0b6fa1de60 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-10:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 1FZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 1FZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.10
+      mac: ec:f4:bb:d0:f7:48
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d0:f7:4a
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f7:4a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f7:4d
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d0:f7:4c
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.10
+      mac: ec:f4:bb:d0:f7:4d
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f7:48
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
index 273dde10c5e9d582d8c873508d4819f05ede1043..6b1b9a044c5ed0a41e4a5f5433efc80f891462a0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 7GZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 7GZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.11
+      mac: ec:f4:bb:d0:f7:10
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d0:f7:12
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f7:12
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f7:15
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.11
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d0:f7:10
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f7:14
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d0:f7:14
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f7:15
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
index 0290c26a4e4844f3773aa536f36dd1cd1f59c1c1..0761d993521088b21ddf9fe80f30ebe533334af0 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-12:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 4GZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 4GZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f1:4a
-      mounted: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.97.12
-      management: false
-      driver: ixgbe
-      rate: 10000000000
       mac: ec:f4:bb:d0:f1:48
+      management: false
       mounted: true
-    eth3:
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f1:4a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f1:4d
       mounted: false
+      rate: 10000000000
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f1:4c
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d0:f1:4c
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f1:4d
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
index b1195fe283cb104960b518bc50749e72d0b9c53b..5a2aa1a7b9c91fedd1f19c492f57ac881f259e47 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-13:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 5LZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 5LZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.13
+      mac: ec:f4:bb:d0:f5:f8
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d0:f5:fa
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f5:fa
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f5:fd
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.13
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d0:f5:f8
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f5:fc
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d0:f5:fc
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f5:fd
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
index 71528bbf143e89a1120195d3ce08db283a2f120e..4053a92327fd9f8c75df0f0c8ecd4186a7c395fa 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-14:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 8ZQGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 8ZQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.14
+      mac: ec:f4:bb:d1:05:90
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:05:92
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:05:92
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:05:95
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d1:05:94
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.14
+      mac: ec:f4:bb:d1:05:95
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:05:90
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
index 03cf3c7444e4b59d782ae14f005c58d55cca2b13..da833ee67a91ca01c1f703ba813df46d5cf3501a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-15:
+  architecture:
+    platform_type: x86_64
+    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: 9JZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.15
+      mac: ec:f4:bb:d0:25:90
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:25:95
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:25:92
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:25:94
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:25:94
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:25:92
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.15
+      mac: ec:f4:bb:d0:25:95
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:25:90
-      mounted: true
-  chassis:
-    serial: 9JZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
index b6ad78365558734cd510d0adb2127e603c11e8ea..f2d49ad4e38dcb0d764b91e782d22b10b5285427 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-16:
+  architecture:
+    platform_type: x86_64
+    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: 2XG6152
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.97.16
-      driver: ixgbe
       mac: ec:f4:bb:d6:10:38
-      rate: 10000000000
-      mounted: true
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: ec:f4:bb:d6:10:3a
-      rate: 10000000000
-      mounted: false
       management: false
+      mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d6:10:3c
-      mounted: false
       management: false
+      mounted: false
     eth3:
-      interface: Ethernet
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d6:10:3d
-      mounted: false
       management: false
-  supported_job_types:
-    virtual: ivt
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
-  processor:
-    clock_speed: 2400000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
-  chassis:
-    serial: 2XG6152
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
+      mounted: false
   storage_devices:
-    sdc:
-      device: sdc
-      size: 600127266816
+    sda:
+      device: sda
       model: ST600MM0006
       rev: LS0A
+      size: 600127266816
     sdb:
       device: sdb
+      model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdc:
+      device: sdc
       model: ST600MM0006
       rev: LS0A
+      size: 600127266816
     sdd:
       device: sdd
-      size: 600127266816
       model: ST600MM0006
       rev: LS0A
+      size: 600127266816
     sde:
       device: sde
-      size: 600127266816
       model: ST600MM0006
       rev: LS0A
+      size: 600127266816
     sdf:
       device: sdf
-      size: 200049647616
       model: PX02SSF020
       rev: A4AE
-    sda:
-      device: sda
-      size: 600127266816
-      model: ST600MM0006
-      rev: LS0A
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
index e660c2af2fe1448524f3b8a18798480453524893..647b68db9744428b63c605e7c79a79d2bf5b2b08 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-17:
+  architecture:
+    platform_type: x86_64
+    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: 3JZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.17
+      mac: ec:f4:bb:d1:01:b8
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:01:bd
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:ba
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:01:bc
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:bc
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:01:ba
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.17
+      mac: ec:f4:bb:d1:01:bd
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:01:b8
-      mounted: true
-  chassis:
-    serial: 3JZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
index bafd7abded8e22e82cc0ad2b4818ef3d1b811c98..143d3544490f7d77081046e185c0ea03089d8817 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-18:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: FZQGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: FZQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.18
+      mac: ec:f4:bb:d1:11:c8
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:11:cd
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:11:ca
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:11:cc
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:11:cc
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:11:ca
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.18
+      mac: ec:f4:bb:d1:11:cd
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:11:c8
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
index 151094e5e02062013de3d0ca7e9526b24cf1e8c0..da5fe3430132a519bb2837aefddb03280413b416 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-19:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: C0RGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: C0RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:24:8a
-      mounted: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.97.19
-      management: false
-      driver: ixgbe
-      rate: 10000000000
       mac: ec:f4:bb:d1:24:88
+      management: false
       mounted: true
-    eth3:
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:24:8a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:24:8d
       mounted: false
+      rate: 10000000000
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:24:8c
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d1:24:8c
+      interface: Ethernet
+      mac: ec:f4:bb:d1:24:8d
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
index 165f7a24123c3d58b7169aa7a0da8b01b5c63552..b4b1d4f1e0bb3e56168e29a4dec2a32d8401518c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-2:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: BGZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: BGZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.2
+      mac: ec:f4:bb:d0:f8:50
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f8:55
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f8:52
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f8:54
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f8:54
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f8:52
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.2
+      mac: ec:f4:bb:d0:f8:55
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f8:50
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
index bbf1c913a8859482ade1ecc81e800652150c8790..908ab3fe72e5305383f3eaf6f015478123de6771 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-20:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 31000000000G42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 31RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.20
+      mac: ec:f4:bb:d0:fd:30
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fd:35
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fd:32
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fd:34
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:fd:34
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fd:32
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.20
+      mac: ec:f4:bb:d0:fd:35
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fd:30
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
index f9534a8cecb19b3a1aeb334014684e67ab2f8e09..5e5588468f3125e55a2fc942e1e87ee016bda5e1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-21:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 7HZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 7HZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.21
+      mac: ec:f4:bb:d0:ff:f8
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d0:ff:fa
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:fa
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:ff:fd
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.21
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d0:ff:f8
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:fc
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d0:ff:fc
+      interface: Ethernet
+      mac: ec:f4:bb:d0:ff:fd
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
index 49df858adab94014ab15393e6a80ba7de96499f3..2ee8220da2175fedc42b60494efe15786d462400 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-22:
+  architecture:
+    platform_type: x86_64
+    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: 4KZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.22
+      mac: ec:f4:bb:d1:00:60
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:00:62
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:62
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:65
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.22
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d1:00:60
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:64
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d1:00:64
+      interface: Ethernet
+      mac: ec:f4:bb:d1:00:65
+      management: false
       mounted: false
-  chassis:
-    serial: 4KZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
index 94485df7e49e1c32df76275152454af1002618ec..0c2f3577ed88de6b7fb722752fce8ab5ab122264 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-23:
+  architecture:
+    platform_type: x86_64
+    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: 20RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.23
+      mac: ec:f4:bb:d1:0e:60
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:0e:62
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:0e:62
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:0e:65
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d1:0e:64
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.23
+      mac: ec:f4:bb:d1:0e:65
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:0e:60
-      mounted: true
-  chassis:
-    serial: 20RGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
index de4ba7b954b2a4bd987c9d8a08c9bbcc3eb29732..94532e84e7999bd2f2db4fec70cb538209565912 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-24:
+  architecture:
+    platform_type: x86_64
+    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: 50RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.24
+      mac: ec:f4:bb:d1:10:18
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:10:1a
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:10:1a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:10:1d
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.24
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d1:10:18
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:10:1c
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d1:10:1c
+      interface: Ethernet
+      mac: ec:f4:bb:d1:10:1d
+      management: false
       mounted: false
-  chassis:
-    serial: 50RGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
index 36966c5860bf95c178a031463c18c35208a553cf..8933ed091117c29d6d2e3565d257698a530418da 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-25:
+  architecture:
+    platform_type: x86_64
+    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: 70RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.25
+      mac: ec:f4:bb:d1:0d:d8
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:0d:da
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:0d:da
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:0d:dd
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d1:0d:dc
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.25
+      mac: ec:f4:bb:d1:0d:dd
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:0d:d8
-      mounted: true
-  chassis:
-    serial: 70RGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
index d597959ddb8af93b9e450e7a2cb490e92df2c5ad..3ecbb33f467f796e680dd7b1ef812b34991fa698 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-26:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 90RGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 90RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.26
+      mac: ec:f4:bb:d1:26:08
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:26:0a
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:26:0a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:26:0d
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d1:26:0c
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.26
+      mac: ec:f4:bb:d1:26:0d
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:26:08
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
index b5f1115299a530706bf89201e70146d7678c73c8..00755de1e9ee0f3e6124ae8ab901533fd96a8a44 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-27:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: H0RGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: H0RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.27
+      mac: ec:f4:bb:d0:fb:e8
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d0:fb:ea
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fb:ea
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fb:ed
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d0:fb:ec
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.27
+      mac: ec:f4:bb:d0:fb:ed
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fb:e8
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
index 4e13cfb680f30e03f3c49412d71fd69412263dd2..bedf99d2ed5b2a48e4c8bf089fad415bb1b87453 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: 30RGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: 30RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      interface: Ethernet
-      management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:04:3a
-      mounted: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.97.28
-      management: false
-      driver: ixgbe
-      rate: 10000000000
       mac: ec:f4:bb:d1:04:38
+      management: false
       mounted: true
-    eth3:
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:04:3a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:04:3d
       mounted: false
+      rate: 10000000000
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:04:3c
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d1:04:3c
+      interface: Ethernet
+      mac: ec:f4:bb:d1:04:3d
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
index b62cbdbb0330ffdbc7a0020c4358055c6c9664fe..a287b73eafabb015f79d6d058096ead8d816e32a 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-3:
+  architecture:
+    platform_type: x86_64
+    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: 8FZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.3
+      mac: ec:f4:bb:d0:f3:18
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d0:f3:1a
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f3:1a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f3:1d
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.3
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d0:f3:18
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f3:1c
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d0:f3:1c
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f3:1d
+      management: false
       mounted: false
-  chassis:
-    serial: 8FZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
index 3cac2b1adb34270871b2bdb89067a5bc9579709d..10fa494dca5f09c4c1a5f507aa72592dce72852c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-4:
+  architecture:
+    platform_type: x86_64
+    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: HHZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.4
+      mac: ec:f4:bb:d1:02:88
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:02:8a
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:8a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:02:8d
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.4
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d1:02:88
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:8c
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d1:02:8c
+      interface: Ethernet
+      mac: ec:f4:bb:d1:02:8d
+      management: false
       mounted: false
-  chassis:
-    serial: HHZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
index 853652e012f55d6419b49bedf1e1d41e7707196e..bde1bb0b7a336c0057e48c5645e2f7d0f157af7e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-5:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: CKZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: CKZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.5
+      mac: ec:f4:bb:d1:02:60
       management: false
-      driver: ixgbe
+      mounted: true
       rate: 10000000000
-      mac: ec:f4:bb:d1:02:62
-      mounted: false
-    eth3:
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:62
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:02:65
       mounted: false
-    eth0:
-      interface: Ethernet
-      ip: 172.16.97.5
-      management: false
-      driver: ixgbe
       rate: 10000000000
-      mac: ec:f4:bb:d1:02:60
-      mounted: true
     eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:64
       management: false
+      mounted: false
+    eth3:
       driver: igb
-      mac: ec:f4:bb:d1:02:64
+      interface: Ethernet
+      mac: ec:f4:bb:d1:02:65
+      management: false
       mounted: false
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
index f2246d799014a40a1c64b1091e24a9a203a9d4f0..e59ffbddff24dc274c0a75a39dd73c9286d2bc94 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-6:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: HKZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: HKZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.6
+      mac: ec:f4:bb:d1:00:70
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:75
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:72
       management: false
-      driver: igb
-      mac: ec:f4:bb:d1:00:74
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:74
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:00:72
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.6
+      mac: ec:f4:bb:d1:00:75
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d1:00:70
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
index 530820132258ab5db8e1eb79fe2b79e6ac0d6a0f..aac16e55399ebc347b3dfd0f202542f7a4bb4319 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-7:
+  architecture:
+    platform_type: x86_64
+    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: 3FZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.7
+      mac: ec:f4:bb:d0:fc:38
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:fc:3d
-      mounted: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
-      management: false
       driver: ixgbe
-      rate: 10000000000
+      interface: Ethernet
       mac: ec:f4:bb:d0:fc:3a
+      management: false
       mounted: false
+      rate: 10000000000
     eth2:
-      interface: Ethernet
-      management: false
       driver: igb
+      interface: Ethernet
       mac: ec:f4:bb:d0:fc:3c
+      management: false
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.7
+      mac: ec:f4:bb:d0:fc:3d
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:fc:38
-      mounted: true
-  chassis:
-    serial: 3FZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
index 9e7a63758a79e9fe1276aace2326d56259cc5250..f99cbd8611618e8fb927016441eaf1194603c791 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-8:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 16
+  bios:
+    release_date: 08/28/2014
+    vendor: Dell Inc.
+    version: 1.0
   chassis:
-    serial: GFZGG42
     manufacturer: Dell Inc.
     name: PowerEdge R630
+    serial: GFZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.8
+      mac: ec:f4:bb:d0:f2:48
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f2:4d
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f2:4a
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f2:4c
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f2:4c
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f2:4a
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.8
+      mac: ec:f4:bb:d0:f2:4d
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f2:48
-      mounted: true
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
index 94dabe6150947bf4edd47fd23fb890f762149472..6d19e3c0fefb921be4be055f33165bc17b1556f9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -1,88 +1,78 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 parasilo-9:
+  architecture:
+    platform_type: x86_64
+    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: DDZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.97.9
+      mac: ec:f4:bb:d0:f0:b8
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f0:bd
-      mounted: false
-    eth2:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f0:ba
       management: false
-      driver: igb
-      mac: ec:f4:bb:d0:f0:bc
       mounted: false
-    eth1:
+      rate: 10000000000
+    eth2:
+      driver: igb
       interface: Ethernet
+      mac: ec:f4:bb:d0:f0:bc
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f0:ba
       mounted: false
-    eth0:
+    eth3:
+      driver: igb
       interface: Ethernet
-      ip: 172.16.97.9
+      mac: ec:f4:bb:d0:f0:bd
       management: false
-      driver: ixgbe
-      rate: 10000000000
-      mac: ec:f4:bb:d0:f0:b8
-      mounted: true
-  chassis:
-    serial: DDZGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  bios:
-    version: 1.0
-    vendor: Dell Inc.
-    release_date: 08/28/2014
-  main_memory:
-    ram_size: 137438953472
-  processor:
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    vendor: Intel
-    version: E5-2630 v3
-    cache_l1d: 32768
-    cache_l1i: 32768
-    model: Intel Xeon
-    cache_l3: 20971520
-    cache_l2: 262144
-    instruction_set: x86-64
-    clock_speed: 2400000000
-  supported_job_types:
-    virtual: ivt
+      mounted: false
   storage_devices:
-    sdf:
-      device: sdf
-      rev: A4AE
-      model: PX02SSF020
-      size: 200049647616
-    sde:
-      device: sde
-      rev: LS0A
+    sda:
+      device: sda
       model: ST600MM0006
-      size: 600127266816
-    sdd:
-      device: sdd
       rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
     sdc:
       device: sdc
-      rev: LS0A
       model: ST600MM0006
-      size: 600127266816
-    sdb:
-      device: sdb
       rev: LS0A
-      model: ST600MM0006
       size: 600127266816
-    sda:
-      device: sda
+    sdd:
+      device: sdd
+      model: ST600MM0006
       rev: LS0A
+      size: 600127266816
+    sde:
+      device: sde
       model: ST600MM0006
+      rev: LS0A
       size: 600127266816
-  architecture:
-    smt_size: 16
-    smp_size: 2
-    platform_type: x86_64
+    sdf:
+      device: sdf
+      model: PX02SSF020
+      rev: A4AE
+      size: 200049647616
+  supported_job_types:
+    virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_diff.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0fcb74e954ba611e823205281498dbd08b72c638
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_diff.yaml
@@ -0,0 +1,99 @@
+---
+nodes:
+  parasilo-[1-28]:
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 20971520
+      clock_speed: 2400000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
+      vendor: Intel
+      version: E5-2630 v3
+
+  parasilo-1:
+    chassis:
+      serial: 1GZGG42
+  parasilo-10:
+    chassis:
+      serial: 1FZGG42
+  parasilo-11:
+    chassis:
+      serial: 7GZGG42
+  parasilo-12:
+    chassis:
+      serial: 4GZGG42
+  parasilo-13:
+    chassis:
+      serial: 5LZGG42
+  parasilo-14:
+    chassis:
+      serial: 8ZQGG42
+  parasilo-15:
+    chassis:
+      serial: 9JZGG42
+  parasilo-16:
+    chassis:
+      serial: 2XG6152
+  parasilo-17:
+    chassis:
+      serial: 3JZGG42
+  parasilo-18:
+    chassis:
+      serial: FZQGG42
+  parasilo-19:
+    chassis:
+      serial: C0RGG42
+  parasilo-2:
+    chassis:
+      serial: BGZGG42
+  parasilo-20:
+    chassis:
+      serial: 31000000000G42
+  parasilo-21:
+    chassis:
+      serial: 7HZGG42
+  parasilo-22:
+    chassis:
+      serial: 4KZGG42
+  parasilo-23:
+    chassis:
+      serial: 20RGG42
+  parasilo-24:
+    chassis:
+      serial: 50RGG42
+  parasilo-25:
+    chassis:
+      serial: 70RGG42
+  parasilo-26:
+    chassis:
+      serial: 90RGG42
+  parasilo-27:
+    chassis:
+      serial: H0RGG42
+  parasilo-28:
+    chassis:
+      serial: 30RGG42
+  parasilo-3:
+    chassis:
+      serial: 8FZGG42
+  parasilo-4:
+    chassis:
+      serial: HHZGG42
+  parasilo-5:
+    chassis:
+      serial: CKZGG42
+  parasilo-6:
+    chassis:
+      serial: HKZGG42
+  parasilo-7:
+    chassis:
+      serial: 3FZGG42
+  parasilo-8:
+    chassis:
+      serial: GFZGG42
+  parasilo-9:
+    chassis:
+      serial: DDZGG42
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
index 0a484bd10483f910680803739f387aff6f8c0647..e914d371b325959467f72ccdbe4d52f1219a9717 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -1,71 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-1:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 42RGG42
   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: 42RGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    bmc:
-      mac: b8:2a:72:fc:f6:22
-      ip: 172.17.96.1
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:22
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.1
+      mac: ec:f4:bb:d0:fb:20
       management: false
-      mac: ec:f4:bb:d0:fb:25
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fb:20
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fb:22
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.1
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fb:24
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fb:25
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
index 1b50a3fdd29ece85362b8eab3670558794ddec0e..e3748f69e762e1b68084b193146875a76138eae2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-10:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 79WGG42
   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: 79WGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:b2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.10
+      mac: ec:f4:bb:d0:fa:b0
       management: false
-      mac: ec:f4:bb:d0:fa:b5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fa:b0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fa:b2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.10
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fa:b4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:fa:b5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
index 8bec2c1c0bb053301b28701181f110a997bcd3aa..60192427de46907db322866bf51d440913837ddb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-11:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: HTQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:4a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.11
+      mac: ec:f4:bb:d0:fa:48
       management: false
-      mac: ec:f4:bb:d0:fa:4d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fa:48
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fa:4a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.11
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fa:4c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fa:4d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
index 0f49a48128d47fbb916525ea11aab07e0d6363ed..73475053c7aa5baa4156f6a3bea8862d8e20935f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-12:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 3TZGG42
   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: 3TZGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:25
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.12
+      mac: ec:f4:bb:d1:00:20
       management: false
-      mac: ec:f4:bb:d1:00:24
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:22
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:22
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:00:24
       management: false
-      mac: ec:f4:bb:d1:00:20
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.12
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:00:25
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
index fab5ce68f7f956db848925e45b27f12db750fdd7..876d0b08633f38d1012d45aedbfd8a3920ea9883 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-13:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: F3RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:62
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.13
+      mac: ec:f4:bb:d0:f7:60
       management: false
-      mac: ec:f4:bb:d0:f7:65
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f7:60
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f7:62
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.13
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:f7:64
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f7:65
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
index 6e055f8fe52ec0c2f0ee16262ec168c22023e904..c955afc2c4a1d4d4c5bbec1317c6ba2b125bd566 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-14:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: GSZGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:5a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.14
+      mac: ec:f4:bb:d1:01:58
       management: false
-      mac: ec:f4:bb:d1:01:5d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:58
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:5a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.14
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:01:5c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:01:5d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
index f1d531349f7940265753212ff83c60bcd44f5356..cbb3132d9ea1a269bbaa1f73d8a5907e2706f388 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-15:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 63RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:92
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.15
+      mac: ec:f4:bb:d0:fe:90
       management: false
-      mac: ec:f4:bb:d0:fe:95
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:90
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fe:92
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.15
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fe:94
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fe:95
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
index 2b31c1284a407bbff2de5296b584057cafd53ff9..609945f36ec1a5381aadd4bf839fe1a203d7dee6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-16:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 2HXGG42
   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: 2HXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:3a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.16
+      mac: ec:f4:bb:d1:01:38
       management: false
-      mac: ec:f4:bb:d1:01:3d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:38
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:3a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.16
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:01:3c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:01:3d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
index eb43066ae7584f918e0271ef6f3d94cc79d19e07..4fc2d4017fffeb9e56ee729a0cecf854c43a340f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-17:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 3MXGG42
   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: 3MXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:c2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.17
+      mac: ec:f4:bb:d1:01:c0
       management: false
-      mac: ec:f4:bb:d1:01:c5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:c0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:c2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.17
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:01:c4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:01:c5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
index 75ab83c4d63a2de1119d97fe64285810139baf95..41c1f20577e37cd90eaec2950752d53fd4b7cc7b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-18:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 10VGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:ea
-      interface: Ethernet
-      rate: 10000000000
     eth0:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:e8
       interface: Ethernet
-      rate: 10000000000
       ip: 172.16.96.18
-    eth3:
-      driver: igb
-      mounted: false
+      mac: ec:f4:bb:d1:02:e8
       management: false
-      mac: ec:f4:bb:d1:02:ed
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:ea
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:02:ec
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:ed
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
index c4b7fc2ace3574a0f509806b7d2d01b44e6d70aa..da5cc270b8bb5d911635ea86f38cd33408ae1ea8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-19:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: CFXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:9a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.19
+      mac: ec:f4:bb:d1:02:98
       management: false
-      mac: ec:f4:bb:d1:02:9d
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:9a
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:9c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d1:02:9c
       management: false
-      mac: ec:f4:bb:d1:02:98
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.19
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:9d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
index b8bcbe614ca55b80403b436b0628718c83e7474d..be994281899e40bb5a5e72ddba2d23d25d7256a0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-2:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 6XQGG42
   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: 6XQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:b6:c5
-      interface: Ethernet
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:b6:c2
       interface: Ethernet
+      ip: 172.16.96.2
+      mac: ec:f4:bb:d0:b6:c0
+      management: false
+      mounted: true
       rate: 10000000000
-    eth0:
+    eth1:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:b6:c0
       interface: Ethernet
+      mac: ec:f4:bb:d0:b6:c2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.2
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:b6:c4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:b6:c5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
index 3adf47eb410ed0eef38ea81e288730190cf034d5..1e71b10b9c4b1e124cc33bb72f96db1a86b1868c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-20:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 4VXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:02
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.20
+      mac: ec:f4:bb:d1:00:00
       management: false
-      mac: ec:f4:bb:d1:00:05
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:00
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:02
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.20
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:00:04
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:00:05
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
index 1594bffa568d2e19c2dfada43b607c2d64967dbe..726d2b1835e6fdc086239d9a64312981dadeb370 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-21:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 3NXGG42
   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: 3NXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:cf:d1:0a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.21
+      mac: ec:f4:bb:cf:d1:08
       management: false
-      mac: ec:f4:bb:cf:d1:0d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:cf:d1:08
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:cf:d1:0a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.21
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:cf:d1:0c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:cf:d1:0d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
index 5ecdd4302a47f7af5b87dd24771db50ea39fc767..95f4f5fdbb490234ed7c3817a6f77f1fbc756dba 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-22:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 81000000000G42
   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: 81RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:1d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.22
+      mac: ec:f4:bb:d1:04:18
       management: false
-      mac: ec:f4:bb:d1:04:1c
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:1a
       interface: Ethernet
+      mac: ec:f4:bb:d1:04:1a
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:04:1c
       management: false
-      mac: ec:f4:bb:d1:04:18
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.22
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:04:1d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
index 08f1e0c5a17cd8d6e129a86ca67da1081fb05790..7359ac305dd54ae6fd5e09e263046f11cba353fa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-23:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 1XQGG42
   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: 1XQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:25
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.23
+      mac: ec:f4:bb:d1:02:20
       management: false
-      mac: ec:f4:bb:d1:02:24
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:22
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:22
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:02:24
       management: false
-      mac: ec:f4:bb:d1:02:20
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.23
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:25
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
index ac176af0e599a6a631f2cb39ca13596db574914f..8e9f7d38239364a3c357690aeb3dd5e862263e92 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-24:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: CVQGG42
   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: CVQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:ed
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.96.24
+      mac: ec:f4:bb:d0:f6:e8
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:ea
       interface: Ethernet
+      mac: ec:f4:bb:d0:f6:ea
+      management: false
+      mounted: false
       rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:ec
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:f6:ec
       management: false
-      mac: ec:f4:bb:d0:f6:e8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.24
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:f6:ed
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
index f2a61bd9731e1bacdfaa2ac0850a2a33fe0e376c..e3c9c245dc7b95153d0a7e7383b058a0584fcf0c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-25:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: BFWGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:1a
-      interface: Ethernet
-      rate: 10000000000
     eth0:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:18
       interface: Ethernet
-      rate: 10000000000
       ip: 172.16.96.25
-    eth3:
-      driver: igb
-      mounted: false
+      mac: ec:f4:bb:d1:02:18
       management: false
-      mac: ec:f4:bb:d1:02:1d
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:1a
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:02:1c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:1d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
index 965de6254c8f679b03c4a59d6a124efe844a92eb..5d007a0fc6aa6347329f0c910acd8ef1a5e414aa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-26:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: D9WGG42
   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: D9WGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:06:e2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.26
+      mac: ec:f4:bb:d1:06:e0
       management: false
-      mac: ec:f4:bb:d1:06:e5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:06:e0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:06:e2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.26
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:06:e4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:06:e5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
index 62a1779309aacf3432b11681659a3cb71d601ba4..5ff006bc7c9a54e0aaf445acac596c38b235cb50 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-27:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 2FWGG42
   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: 2FWGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:0d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.96.27
+      mac: ec:f4:bb:d0:f0:08
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:0a
       interface: Ethernet
+      mac: ec:f4:bb:d0:f0:0a
+      management: false
+      mounted: false
       rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:0c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:f0:0c
       management: false
-      mac: ec:f4:bb:d0:f0:08
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.27
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:f0:0d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
index 65654208054d7fea98fa7b72e06593ce4fc22665..fb3b490e4f8a8ac0d7fec36923f6b2bf98e588ca 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-28:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: BQQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f9:0d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.28
+      mac: ec:f4:bb:d0:f9:08
       management: false
-      mac: ec:f4:bb:d0:f9:0c
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f9:0a
       interface: Ethernet
+      mac: ec:f4:bb:d0:f9:0a
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f9:0c
       management: false
-      mac: ec:f4:bb:d0:f9:08
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.28
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f9:0d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
index 64431b27b4d6de22724e96304a6c701c0c0e62a7..c9a9e25e0adef13ed44d258b8421e9d1238e14a9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-29:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: J9WGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:85
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.29
+      mac: ec:f4:bb:d0:fe:80
       management: false
-      mac: ec:f4:bb:d0:fe:84
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:82
       interface: Ethernet
+      mac: ec:f4:bb:d0:fe:82
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:fe:84
       management: false
-      mac: ec:f4:bb:d0:fe:80
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.29
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fe:85
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
index 4bdb413084145ce6d2b2f3497479589f1c6f5ace..693d7987526dff6112bf6bd6338b609f6021e68d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-3:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: G1000000000G42
   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: G1RGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:cd
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.3
+      mac: ec:f4:bb:d0:f0:c8
       management: false
-      mac: ec:f4:bb:d0:f0:cc
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:ca
       interface: Ethernet
+      mac: ec:f4:bb:d0:f0:ca
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f0:cc
       management: false
-      mac: ec:f4:bb:d0:f0:c8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.3
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f0:cd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
index fc6885280d56ea448e0bd283b4658a8c4348baad..de602d72fa9e5537920e344bfe70294f3159d951 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-31:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 14RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:9a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.31
+      mac: ec:f4:bb:d0:f8:98
       management: false
-      mac: ec:f4:bb:d0:f8:9d
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f8:9a
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:9c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:f8:9c
       management: false
-      mac: ec:f4:bb:d0:f8:98
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.31
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f8:9d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
index 56b7b8d016072d8cf2b80f410f3acebbd8359aca..dd656aee357644640f2fd8963253cf74e6d9b591 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-32:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 5QXGG42
   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: 5QXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:f5
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.96.32
+      mac: ec:f4:bb:d1:00:f0
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:f2
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:f2
+      management: false
+      mounted: false
       rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:f4
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d1:00:f4
       management: false
-      mac: ec:f4:bb:d1:00:f0
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.32
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:00:f5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
index 7e8fe57ed1caa330a87bec7893968e17cdfcb97b..f716effd2c242f4e62eee2b469dc90d67b171abc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-33:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 3DWGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:04:4a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.33
+      mac: ec:f4:bb:d1:04:48
       management: false
-      mac: ec:f4:bb:d1:04:4d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:04:48
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:04:4a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.33
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:04:4c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:04:4d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
index 4e5449b8f8953dddee1af307c6a7898587c6f95f..556ffcbb65753acac8116871858c89b34447c95f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-34:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: BRQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:0a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.34
+      mac: ec:f4:bb:d0:f5:08
       management: false
-      mac: ec:f4:bb:d0:f5:0d
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f5:0a
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f5:0c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:f5:0c
       management: false
-      mac: ec:f4:bb:d0:f5:08
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.34
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f5:0d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
index e0f66e46e13458e16215901dc7b2b5fd3b2aa23a..b5640010ab9eb9ab0cf6624ba0733e2b55d695d6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-36:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: FBWGG42
   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: FBWGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:22
-      interface: Ethernet
-      rate: 10000000000
     eth0:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:20
       interface: Ethernet
-      rate: 10000000000
       ip: 172.16.96.36
-    eth3:
-      driver: igb
-      mounted: false
+      mac: ec:f4:bb:d0:fe:20
       management: false
-      mac: ec:f4:bb:d0:fe:25
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fe:22
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fe:24
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:fe:25
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
index bb1ae1c7e8360ed0dd54d1f796d9a19a62831ca7..071f532f70146ad67b262a666ccbf58edfa946e4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-37:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 23RGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:da
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.37
+      mac: ec:f4:bb:d0:f0:d8
       management: false
-      mac: ec:f4:bb:d0:f0:dd
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f0:d8
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f0:da
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.37
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:f0:dc
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f0:dd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
index 833f48ae6644c238ca03ad870adf8edf83fb2264..da1c03e620defbfe91f9fcae23845b7a58e6024d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-38:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 3XQGG42
   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: 3XQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fd:e2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.38
+      mac: ec:f4:bb:d0:fd:e0
       management: false
-      mac: ec:f4:bb:d0:fd:e5
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fd:e2
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fd:e4
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:fd:e4
       management: false
-      mac: ec:f4:bb:d0:fd:e0
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.38
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fd:e5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
index f2f4ca2a2b484c4dd3068ccce159242b6b616e33..51f3661fb5648f4a8825f8e246f9d13f45b5aa33 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-39:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: B3VGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:dd
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.39
+      mac: ec:f4:bb:d0:ff:d8
       management: false
-      mac: ec:f4:bb:d0:ff:dc
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:da
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:da
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:ff:dc
       management: false
-      mac: ec:f4:bb:d0:ff:d8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.39
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:ff:dd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
index fd609b6763ee20e706a9c6a0fc9c905534f665b9..ba63e94ed2ff83c3c435fa13919f823f58b2900f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-4:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: DWQGG42
   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: DWQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:45
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.4
+      mac: ec:f4:bb:d1:00:40
       management: false
-      mac: ec:f4:bb:d1:00:44
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:42
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:42
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:00:44
       management: false
-      mac: ec:f4:bb:d1:00:40
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.4
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:00:45
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
index 6857cc1e73e59c4937b2b4c06eaf869c22b6dcae..0fe02fc7604a050e283841675d0aa7c7749c1f0d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-40:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 92RGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f8:22
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.40
+      mac: ec:f4:bb:d0:f8:20
       management: false
-      mac: ec:f4:bb:d0:f8:25
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f8:20
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f8:22
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.40
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:f8:24
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f8:25
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
index 053f61a601f3e0c03ee7eb127e23f1c9cc12240e..55952819c5385d2229f5cc6e38defcc9e6d47c05 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-41:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 8PQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:fd
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.41
+      mac: ec:f4:bb:d0:f0:f8
       management: false
-      mac: ec:f4:bb:d0:f0:fc
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f0:fa
       interface: Ethernet
+      mac: ec:f4:bb:d0:f0:fa
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f0:fc
       management: false
-      mac: ec:f4:bb:d0:f0:f8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.41
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:f0:fd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
index d0ac62ad925733d890876cb974a3fabf0be169a5..3eaff05735ab8dd03f7865d24564de4504da2412 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-42:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 64RGG42
   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: 64RGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fe:d2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.42
+      mac: ec:f4:bb:d0:fe:d0
       management: false
-      mac: ec:f4:bb:d0:fe:d5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fe:d0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fe:d2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.42
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fe:d4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fe:d5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
index 995d5c26746c6acb4ce492389603e48d116b9bee..ee6160161feb2c19fa45372b6389ba59ee30c72a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-43:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 3SQGG42
   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: 3SQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fa:3a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.43
+      mac: ec:f4:bb:d0:fa:38
       management: false
-      mac: ec:f4:bb:d0:fa:3d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fa:38
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:fa:3a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.43
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fa:3c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fa:3d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
index 047e997be0f0bcfb3c63f5fbf2b1228ac86183e6..f2af216be4190f39cb7014bae51a7f867c9ae6e0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-44:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 9NXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:eb:52
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.44
+      mac: ec:f4:bb:d0:eb:50
       management: false
-      mac: ec:f4:bb:d0:eb:55
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:eb:52
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:eb:54
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:eb:54
       management: false
-      mac: ec:f4:bb:d0:eb:50
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.44
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:eb:55
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
index 26b96c451caa525cb647082a2577cc43f25ad3af..a9b61bd184ee5aa0c39e267ced5b37fb7065c295 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-45:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 9XQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ee:22
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.45
+      mac: ec:f4:bb:d0:ee:20
       management: false
-      mac: ec:f4:bb:d0:ee:25
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ee:20
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:ee:22
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.45
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:ee:24
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:ee:25
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
index db6f54257bf15a4d44211fb1a2a021242bb64a83..de8cfebbeeaad3c4c315117a96fa00ab7db6dc4d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-46:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: BVQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:ce:a5:62
-      interface: Ethernet
-      rate: 10000000000
     eth0:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:ce:a5:60
       interface: Ethernet
-      rate: 10000000000
       ip: 172.16.96.46
-    eth3:
-      driver: igb
-      mounted: false
+      mac: ec:f4:bb:ce:a5:60
       management: false
-      mac: ec:f4:bb:ce:a5:65
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:ce:a5:62
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:ce:a5:64
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:ce:a5:65
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
index b6f071ac800c935a91ccbd1209e8f05774adda7b..841f2aa3fa4b3a90a10000444c0e94eaa9bcd984 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-47:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: DDXGG42
   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: DDXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:9a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.47
+      mac: ec:f4:bb:d1:01:98
       management: false
-      mac: ec:f4:bb:d1:01:9d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:98
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:9a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.47
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:01:9c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:01:9d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
index b9c4d62757b5bedd72a566f8d24d0cbb1a23e624..05786da8ca69b1fbfd946c0e1a78947b4cd0a10d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-48:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: GWQGG42
   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: GWQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:4d
-      interface: Ethernet
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:fb:4a
       interface: Ethernet
+      ip: 172.16.96.48
+      mac: ec:f4:bb:d0:fb:48
+      management: false
+      mounted: true
       rate: 10000000000
-    eth0:
+    eth1:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d0:fb:48
       interface: Ethernet
+      mac: ec:f4:bb:d0:fb:4a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.48
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:fb:4c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:fb:4d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
index 31bedc5c104ddf1e37f55be0abe9b9598392609c..c72ea8532ffcc54dc762232862085ccc57fb5cce 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-49:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: FRXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:d2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.49
+      mac: ec:f4:bb:d0:ff:d0
       management: false
-      mac: ec:f4:bb:d0:ff:d5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:d0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:d2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.49
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:ff:d4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:ff:d5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
index f3d5485f6f581100b24547dc9c99307f09a63db9..e54264cd23a5b6604653a02a47891114db777df6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-5:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 3WQGG42
   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: 3WQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:6d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.5
+      mac: ec:f4:bb:d1:01:68
       management: false
-      mac: ec:f4:bb:d1:01:6c
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:6a
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:6a
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:01:6c
       management: false
-      mac: ec:f4:bb:d1:01:68
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.5
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:01:6d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
index 145e9cabcb171436af78c0ab14a9319293bfe506..d1310ef07694da017f47d342492e5f9d49b6dac6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-50:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 9PXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:5d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.96.50
+      mac: ec:f4:bb:d1:02:58
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:5a
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:5a
+      management: false
+      mounted: false
       rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:5c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d1:02:5c
       management: false
-      mac: ec:f4:bb:d1:02:58
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.50
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:02:5d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
index 221ece73eec9de30fc48f3af7a24370fa6640860..7ce2af141c10562d204fbf466a16202b80448432 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -1,68 +1,46 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-51:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 8JXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:7a
-      interface: Ethernet
-      rate: 10000000000
     eth0:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:78
       interface: Ethernet
-      rate: 10000000000
       ip: 172.16.96.51
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d1:01:7c
-      mounted: false
+      mac: ec:f4:bb:d1:01:78
       management: false
-    eth3:
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d1:01:7d
-      mounted: false
+      mac: ec:f4:bb:d1:01:7a
       management: false
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mounted: false
+      rate: 10000000000
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
index 3d56ddc09b30790a8d10b607f78e6f48ef8f979f..b81dc289ab7d13acb8d6591ad6c0d9f359293de9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-52:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: DSQGG42
   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: DSQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:d2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.52
+      mac: ec:f4:bb:d1:02:d0
       management: false
-      mac: ec:f4:bb:d1:02:d5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:d0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:d2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.52
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:02:d4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:d5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
index 231068a8105140a3824547f8b4b04556196f26ec..cede61346ac3bbf6dccd504c52dcef2d2a1b0a80 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-53:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 4FXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:92
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.53
+      mac: ec:f4:bb:d1:00:90
       management: false
-      mac: ec:f4:bb:d1:00:95
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:92
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:94
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d1:00:94
       management: false
-      mac: ec:f4:bb:d1:00:90
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.53
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:00:95
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
index 53b720cfe55ecd315c3abfd3b6e051225c759a87..a06250c7bfba2846ef436f05f8d524bc8e3a0efc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-54:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 1RQGG42
   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: 1RQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:5a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.54
+      mac: ec:f4:bb:d0:f7:58
       management: false
-      mac: ec:f4:bb:d0:f7:5d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:f7:58
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f7:5a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.54
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:f7:5c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:f7:5d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
index 07fb2e0f2a08042b8cb1412c99f06cf6aad07575..24176152a9599a555d5783dd337221164ae6cbe4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-55:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 5BWGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:35
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.55
+      mac: ec:f4:bb:d0:f6:30
       management: false
-      mac: ec:f4:bb:d0:f6:34
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f6:32
       interface: Ethernet
+      mac: ec:f4:bb:d0:f6:32
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f6:34
       management: false
-      mac: ec:f4:bb:d0:f6:30
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.55
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:f6:35
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
index c1d8de0f68607e8d68dc77722c69f1d18edee01a..476a8638f764a5e4a0ad6d5b120a0359c37c5f62 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-56:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 7KXGG42
   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: 7KXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ed
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.56
+      mac: ec:f4:bb:d1:00:e8
       management: false
-      mac: ec:f4:bb:d1:00:ec
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:ea
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:ea
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:00:ec
       management: false
-      mac: ec:f4:bb:d1:00:e8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.56
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:00:ed
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
index dc7c4825445a5f99d41596b9ed73dc3af1f43e96..a01217fae1c654991f7eb7e045ce1889a06b7a0a 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-57:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 92VGG42
   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: 92VGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:aa
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.57
+      mac: ec:f4:bb:d1:00:a8
       management: false
-      mac: ec:f4:bb:d1:00:ad
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:a8
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:aa
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.57
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:00:ac
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:00:ad
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
index 44408a2a4435035a897ccccc9f54c07538d58027..088b55933256bb088dd03564426f762bbd66ab52 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-58:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 1WQGG42
   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: 1WQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:7d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
+      ip: 172.16.96.58
+      mac: ec:f4:bb:d0:f7:78
+      management: false
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:7a
       interface: Ethernet
+      mac: ec:f4:bb:d0:f7:7a
+      management: false
+      mounted: false
       rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f7:7c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:f7:7c
       management: false
-      mac: ec:f4:bb:d0:f7:78
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.58
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:f7:7d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
index a1784f8f4bcab79d6d6900b8d7f584cbf0981569..f29ccaa24326089f9fc6037c3c64270c8926dd4c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-59:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 58VGG42
   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: 58VGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:03:7a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.59
+      mac: ec:f4:bb:d1:03:78
       management: false
-      mac: ec:f4:bb:d1:03:7d
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:03:7a
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:03:7c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d1:03:7c
       management: false
-      mac: ec:f4:bb:d1:03:78
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.59
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:03:7d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
index c2c52f2f9937283401dd2d83218e4251a12ee59e..49f55f69a1c957adfc48ba9236c91667886ad7c0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-60:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 33VGG42
   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: 33VGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:85
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.60
+      mac: ec:f4:bb:d1:02:80
       management: false
-      mac: ec:f4:bb:d1:02:84
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:82
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:82
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:02:84
       management: false
-      mac: ec:f4:bb:d1:02:80
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.60
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:85
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
index 6d35ffc216b25978972b21eec6600e49e38b4d28..d71f4209ca4b97dd6bcaf36f93b3411183444c65 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-61:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 2SXGG42
   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: 2SXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:2d
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.61
+      mac: ec:f4:bb:d1:00:28
       management: false
-      mac: ec:f4:bb:d1:00:2c
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:2a
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:2a
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:00:2c
       management: false
-      mac: ec:f4:bb:d1:00:28
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.61
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:00:2d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
index e19f345b1b31c09d0581e582ead3ce57f90c3ba7..7c374c789caf9fd875da883c272b8822d316bccf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-62:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 7LXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:0d
-      interface: Ethernet
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:0a
       interface: Ethernet
+      ip: 172.16.96.62
+      mac: ec:f4:bb:d1:00:08
+      management: false
+      mounted: true
       rate: 10000000000
-    eth0:
+    eth1:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:00:08
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:0a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.62
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:00:0c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:00:0d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
index c1c3feb1a2f072264b62a30bea0391f294b08708..d848601148541efc272fbc79bd57d45b38402b22 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-63:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 8SXGG42
   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: 8SXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:cb:f2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.63
+      mac: ec:f4:bb:d0:cb:f0
       management: false
-      mac: ec:f4:bb:d0:cb:f5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:cb:f0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:cb:f2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.63
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:cb:f4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:cb:f5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
index 845cfe141bd723c5df91de2f90e84636680a4988..b5e3e21cb54952583cc23324500b4c70eca90054 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-64:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 26VGG42
   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: 26VGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:2a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.64
+      mac: ec:f4:bb:d1:02:28
       management: false
-      mac: ec:f4:bb:d1:02:2d
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:28
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:2a
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.64
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:02:2c
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:02:2d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
index 76cdf83e684b0db61f8a6c3134cc40445fa96307..0c0fc8f0b77110c7ba8df01d06804c39e84fe229 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-65:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 4PXGG42
   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: 4PXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:02:12
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.65
+      mac: ec:f4:bb:d1:02:10
       management: false
-      mac: ec:f4:bb:d1:02:15
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:02:10
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:02:12
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.65
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:02:14
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:02:15
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
index 0604786f1a662dbe57ab45ab37036d911a28aa9b..1434b13159c719f1fae23efe9edcc5741f4cb045 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-67:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 3GXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
-      driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:f2
-      interface: Ethernet
-      rate: 10000000000
     eth0:
       driver: ixgbe
-      mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:f0
       interface: Ethernet
-      rate: 10000000000
       ip: 172.16.96.67
-    eth3:
-      driver: igb
-      mounted: false
+      mac: ec:f4:bb:d1:01:f0
       management: false
-      mac: ec:f4:bb:d1:01:f5
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:f2
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:01:f4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:01:f5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
index 886aade0b72004571d886758b11ec3a3f8a41a2d..a2727ba2c5b918952fc666db9b79cad61b6211dc 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-68:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
-  chassis:
-    name: PowerEdge R630
-    manufacturer: Dell Inc.
-    serial: 8HXGG42
   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: 8HXGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:ea
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.68
+      mac: ec:f4:bb:d0:ff:e8
       management: false
-      mac: ec:f4:bb:d0:ff:ed
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:e8
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:ea
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.68
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:ff:ec
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:ff:ed
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
index a8659011e084d015d758049e54889d08a0d72fed..c9591af054b8f3c4769b231e60a2f945ad0ac30c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-69:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 47VGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:12
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.69
+      mac: ec:f4:bb:d1:01:10
       management: false
-      mac: ec:f4:bb:d1:01:15
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:12
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:14
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d1:01:14
       management: false
-      mac: ec:f4:bb:d1:01:10
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.69
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:01:15
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
index 7d544f9adcf25c9433f15777c8d0e98ed3b45ca1..379d01f250dd11c3686de346c2e7f386033c90b0 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-7:
+  architecture:
+    platform_type: x86_64
+    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: 6SQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth2:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d0:f4:0c
-      mounted: false
-      management: false
     eth0:
+      driver: ixgbe
       interface: Ethernet
       ip: 172.16.96.7
-      driver: ixgbe
       mac: ec:f4:bb:d0:f4:08
-      rate: 10000000000
-      mounted: true
-      management: false
-    eth3:
-      interface: Ethernet
-      driver: igb
-      mac: ec:f4:bb:d0:f4:0d
-      mounted: false
       management: false
+      mounted: true
+      rate: 10000000000
     eth1:
-      interface: Ethernet
       driver: ixgbe
+      interface: Ethernet
       mac: ec:f4:bb:d0:f4:0a
+      management: false
+      mounted: false
       rate: 10000000000
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f4:0c
+      management: false
       mounted: false
+    eth3:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:f4:0d
       management: false
-  bios:
-    vendor: Dell Inc.
-    version: 1.0
-    release_date: 08/28/2014
+      mounted: false
   storage_devices:
     sda:
       device: sda
-      size: 600127266816
       model: ST600MM0006
       rev: LS0A
+      size: 600127266816
     sdb:
       device: sdb
-      size: 600127266816
       model: ST600MM0006
       rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 6SQGG42
-    manufacturer: Dell Inc.
-    name: PowerEdge R630
-  architecture:
-    smp_size: 2
-    smt_size: 16
-    platform_type: x86_64
-  processor:
-    clock_speed: 2400000000
-    instruction_set: x86-64
-    model: Intel Xeon
-    version: E5-2630 v3
-    vendor: Intel
-    other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
-    cache_l1i: 32768
-    cache_l1d: 32768
-    cache_l2: 262144
-    cache_l3: 20971520
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
index fc352e0a4ea2915cbb82877dd60aed68839b1e6d..62bdd915803a66a5a71e16df0000d72a307ff177 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-70:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 86VGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:b2
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.70
+      mac: ec:f4:bb:d0:ff:b0
       management: false
-      mac: ec:f4:bb:d0:ff:b5
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d0:ff:b0
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:b2
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.70
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d0:ff:b4
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:ff:b5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
index 8557d2cab9f20a1d1a7db6fea75e2354769d1082..e5ca192460666e3624cfe74c19bbedb1f7dc2193 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-71:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: F0VGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:e5
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.71
+      mac: ec:f4:bb:d0:ff:e0
       management: false
-      mac: ec:f4:bb:d0:ff:e4
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:ff:e2
       interface: Ethernet
+      mac: ec:f4:bb:d0:ff:e2
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d0:ff:e4
       management: false
-      mac: ec:f4:bb:d0:ff:e0
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.71
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d0:ff:e5
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
index 0112a66e31d5227bc0e6626aa7d5f3d3ff42e524..137b8b32ad3278534e2258fc5c4f12b7e1def5ab 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-72:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: 2JXGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth3:
-      driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:dd
+    eth0:
+      driver: ixgbe
       interface: Ethernet
-    eth2:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.72
+      mac: ec:f4:bb:d1:00:d8
       management: false
-      mac: ec:f4:bb:d1:00:dc
-      interface: Ethernet
+      mounted: true
+      rate: 10000000000
     eth1:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:00:da
       interface: Ethernet
+      mac: ec:f4:bb:d1:00:da
+      management: false
+      mounted: false
       rate: 10000000000
-    eth0:
-      driver: ixgbe
-      mounted: true
+    eth2:
+      driver: igb
+      interface: Ethernet
+      mac: ec:f4:bb:d1:00:dc
       management: false
-      mac: ec:f4:bb:d1:00:d8
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.72
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d1:00:dd
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
index 079ca026341949218ac3cf074f1fccb4cbf4dda1..b1018fcb0a6e226c9e2ba8475f6695009ff6214f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-8:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: JXQGG42
+  main_memory:
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d1:01:82
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.8
+      mac: ec:f4:bb:d1:01:80
       management: false
-      mac: ec:f4:bb:d1:01:85
-      interface: Ethernet
-    eth0:
-      driver: ixgbe
       mounted: true
-      management: false
-      mac: ec:f4:bb:d1:01:80
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d1:01:82
+      management: false
+      mounted: false
       rate: 10000000000
-      ip: 172.16.96.8
     eth2:
       driver: igb
-      mounted: false
-      management: false
+      interface: Ethernet
       mac: ec:f4:bb:d1:01:84
+      management: false
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-  main_memory:
-    ram_size: 137438953472
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
+      mac: ec:f4:bb:d1:01:85
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
index 0b5d293dbde5e9e6e20553e5672d3f804bc548bf..e91cb9fb504f23f5b99f92529caedc7603ad8e1f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -1,68 +1,58 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 paravance-9:
-  storage_devices:
-    sdb:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sdb
-    sda:
-      size: 600127266816
-      rev: LS0A
-      model: ST600MM0006
-      device: sda
   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:
-    name: PowerEdge R630
     manufacturer: Dell Inc.
+    name: PowerEdge R630
     serial: HSQGG42
   main_memory:
-    ram_size: 137438953472
+    ram_size: 135291469824
   network_adapters:
-    eth1:
+    eth0:
       driver: ixgbe
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f2:2a
       interface: Ethernet
-      rate: 10000000000
-    eth3:
-      driver: igb
-      mounted: false
+      ip: 172.16.96.9
+      mac: ec:f4:bb:d0:f2:28
       management: false
-      mac: ec:f4:bb:d0:f2:2d
+      mounted: true
+      rate: 10000000000
+    eth1:
+      driver: ixgbe
       interface: Ethernet
+      mac: ec:f4:bb:d0:f2:2a
+      management: false
+      mounted: false
+      rate: 10000000000
     eth2:
       driver: igb
-      mounted: false
-      management: false
-      mac: ec:f4:bb:d0:f2:2c
       interface: Ethernet
-    eth0:
-      driver: ixgbe
-      mounted: true
+      mac: ec:f4:bb:d0:f2:2c
       management: false
-      mac: ec:f4:bb:d0:f2:28
+      mounted: false
+    eth3:
+      driver: igb
       interface: Ethernet
-      rate: 10000000000
-      ip: 172.16.96.9
-  bios:
-    release_date: 08/28/2014
-    version: 1.0
-    vendor: Dell Inc.
+      mac: ec:f4:bb:d0:f2:2d
+      management: false
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
+    sdb:
+      device: sdb
+      model: ST600MM0006
+      rev: LS0A
+      size: 600127266816
   supported_job_types:
     virtual: ivt
-  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
-    instruction_set: x86-64
-    version: E5-2630 v3
-    vendor: Intel
-    model: Intel Xeon
-    clock_speed: 2400000000
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance_diff.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..78f91548a94b9a8379f6bf9c620230c32b614bc5
--- /dev/null
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_diff.yaml
@@ -0,0 +1,236 @@
+---
+nodes:
+  paravance-[1-72]:
+    processor:
+      cache_l1d: 32768
+      cache_l1i: 32768
+      cache_l2: 262144
+      cache_l3: 20971520
+      clock_speed: 2400000000
+      instruction_set: x86-64
+      model: Intel Xeon
+      other_description: Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz
+      vendor: Intel
+      version: E5-2630 v3
+
+  paravance-1:
+    chassis:
+      serial: 42RGG42
+    network_adapters:
+      bmc:
+        ip: 172.17.96.1
+        mac: b8:2a:72:fc:f6:22
+  paravance-10:
+    chassis:
+      serial: 79WGG42
+  paravance-11:
+    chassis:
+      serial: HTQGG42
+  paravance-12:
+    chassis:
+      serial: 3TZGG42
+  paravance-13:
+    chassis:
+      serial: F3RGG42
+  paravance-14:
+    chassis:
+      serial: GSZGG42
+  paravance-15:
+    chassis:
+      serial: 63RGG42
+  paravance-16:
+    chassis:
+      serial: 2HXGG42
+  paravance-17:
+    chassis:
+      serial: 3MXGG42
+  paravance-18:
+    chassis:
+      serial: 10VGG42
+  paravance-19:
+    chassis:
+      serial: CFXGG42
+  paravance-2:
+    chassis:
+      serial: 6XQGG42
+  paravance-20:
+    chassis:
+      serial: 4VXGG42
+  paravance-21:
+    chassis:
+      serial: 3NXGG42
+  paravance-22:
+    chassis:
+      serial: 81000000000G42
+  paravance-23:
+    chassis:
+      serial: 1XQGG42
+  paravance-24:
+    chassis:
+      serial: CVQGG42
+  paravance-25:
+    chassis:
+      serial: BFWGG42
+  paravance-26:
+    chassis:
+      serial: D9WGG42
+  paravance-27:
+    chassis:
+      serial: 2FWGG42
+  paravance-28:
+    chassis:
+      serial: BQQGG42
+  paravance-29:
+    chassis:
+      serial: J9WGG42
+  paravance-3:
+    chassis:
+      serial: G1000000000G42
+  paravance-31:
+    chassis:
+      serial: 14RGG42
+  paravance-32:
+    chassis:
+      serial: 5QXGG42
+  paravance-33:
+    chassis:
+      serial: 3DWGG42
+  paravance-34:
+    chassis:
+      serial: BRQGG42
+  paravance-36:
+    chassis:
+      serial: FBWGG42
+  paravance-37:
+    chassis:
+      serial: 23RGG42
+  paravance-38:
+    chassis:
+      serial: 3XQGG42
+  paravance-39:
+    chassis:
+      serial: B3VGG42
+  paravance-4:
+    chassis:
+      serial: DWQGG42
+  paravance-40:
+    chassis:
+      serial: 92RGG42
+  paravance-41:
+    chassis:
+      serial: 8PQGG42
+  paravance-42:
+    chassis:
+      serial: 64RGG42
+  paravance-43:
+    chassis:
+      serial: 3SQGG42
+  paravance-44:
+    chassis:
+      serial: 9NXGG42
+  paravance-45:
+    chassis:
+      serial: 9XQGG42
+  paravance-46:
+    chassis:
+      serial: BVQGG42
+  paravance-47:
+    chassis:
+      serial: DDXGG42
+  paravance-48:
+    chassis:
+      serial: GWQGG42
+  paravance-49:
+    chassis:
+      serial: FRXGG42
+  paravance-5:
+    chassis:
+      serial: 3WQGG42
+  paravance-50:
+    chassis:
+      serial: 9PXGG42
+  paravance-51:
+    chassis:
+      serial: 8JXGG42
+    network_adapters:
+      eth2:
+        driver: igb
+        interface: Ethernet
+        mac: ec:f4:bb:d1:01:7c
+        management: false
+        mounted: false
+      eth3:
+        driver: igb
+        interface: Ethernet
+        mac: ec:f4:bb:d1:01:7d
+        management: false
+        mounted: false
+  paravance-52:
+    chassis:
+      serial: DSQGG42
+  paravance-53:
+    chassis:
+      serial: 4FXGG42
+  paravance-54:
+    chassis:
+      serial: 1RQGG42
+  paravance-55:
+    chassis:
+      serial: 5BWGG42
+  paravance-56:
+    chassis:
+      serial: 7KXGG42
+  paravance-57:
+    chassis:
+      serial: 92VGG42
+  paravance-58:
+    chassis:
+      serial: 1WQGG42
+  paravance-59:
+    chassis:
+      serial: 58VGG42
+  paravance-60:
+    chassis:
+      serial: 33VGG42
+  paravance-61:
+    chassis:
+      serial: 2SXGG42
+  paravance-62:
+    chassis:
+      serial: 7LXGG42
+  paravance-63:
+    chassis:
+      serial: 8SXGG42
+  paravance-64:
+    chassis:
+      serial: 26VGG42
+  paravance-65:
+    chassis:
+      serial: 4PXGG42
+  paravance-67:
+    chassis:
+      serial: 3GXGG42
+  paravance-68:
+    chassis:
+      serial: 8HXGG42
+  paravance-69:
+    chassis:
+      serial: 47VGG42
+  paravance-7:
+    chassis:
+      serial: 6SQGG42
+  paravance-70:
+    chassis:
+      serial: 86VGG42
+  paravance-71:
+    chassis:
+      serial: F0VGG42
+  paravance-72:
+    chassis:
+      serial: 2JXGG42
+  paravance-8:
+    chassis:
+      serial: JXQGG42
+  paravance-9:
+    chassis:
+      serial: HSQGG42
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
index 28cafaede3ad10908bc0acfed7dcf090b030421c..39fd42b004111fc1910eeac4137b65d5e7d02328 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-1.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-1:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT132
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e7:d0
-      ip6: fe80::216:36ff:fe91:e7d0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.1
+      mac: 00:16:36:91:e7:d0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e7:d1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:c8
-      ip: 172.17.129.1
-  chassis:
-    serial: 0650QBT132
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
index 00f37378f91e106c9ce2cb48b6c795bc321a4b2b..6a1db3491e620952e740e5784759e15e1ea6a844 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-10.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-10:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT12E
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:d0
-      ip6: fe80::216:36ff:fe91:ebd0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.10
+      mac: 00:16:36:91:eb:d0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:d1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:9a
-      ip: 172.17.129.10
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT12E
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
index 9c146c21120fb0f5209b6d8a97208f9284cd0b77..2d365139e25c3ddd7fb83c11a88d98b0d0961bb4 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-11.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-11:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT134
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:dc
-      ip6: fe80::216:36ff:fe91:e9dc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.11
+      mac: 00:16:36:91:e9:dc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:dd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:42
-      ip: 172.17.129.11
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT134
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
index 6e2d976f7131fbe4c305fe07233161ccdd7b8803..86cddd845b4f7b14a331413dafb13acbbac57a51 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-12.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-12:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10A
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:60
-      ip6: fe80::216:36ff:fe91:eb60
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.12
+      mac: 00:16:36:91:eb:60
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:61
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:8e
-      ip: 172.17.129.12
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT10A
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
index 374591751d2dbdbd62e93fb0e0fa5118f347b4b0..fb9dc59df14751953a8056d352a89354aacba7d9 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-13.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-13:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT111
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:5c
-      ip6: fe80::216:36ff:fe91:e85c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.13
+      mac: 00:16:36:91:e8:5c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e8:5d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:d9
-      ip: 172.17.129.13
-  chassis:
-    serial: 0650QBT111
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
index 811616f332f49dcbf04841f805048e735b883aa6..7d23fe3c7c9128e9339eb6e74f4be27581367762 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-14.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-14:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT119
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:fb:e4
-      ip6: fe80::216:36ff:fec9:fbe4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.14
+      mac: 00:16:36:c9:fb:e4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:c9:fb:e5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0b:1a
-      ip: 172.17.129.14
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT119
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
index b8fec96eb900acf5e737f8b2c96543c6c80b4012..eb421e707bc88ea019dd63c93c30754973650b69 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-15.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-15:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT11A
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:fb:34
-      ip6: fe80::216:36ff:fec9:fb34
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.15
+      mac: 00:16:36:c9:fb:34
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:c9:fb:35
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0a:cb
-      ip: 172.17.129.15
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT11A
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
index f9af7af3541bc7ed1f8115a8639e6072d7d067c5..1bc9234bf179eed325cc420ef177af005ff3aa3c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-16.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-16:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10F
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:fb:94
-      ip6: fe80::216:36ff:fec9:fb94
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.16
+      mac: 00:16:36:c9:fb:94
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:c9:fb:95
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0b:06
-      ip: 172.17.129.16
-  chassis:
-    serial: 0650QBT10F
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
index 396dc0900322cc5ba9617c26223fc6cd92a896dd..cdf4429249e87053f16850e96c3c7daaa4f22610 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-17.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-17:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT113
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c5:8a:83
-      ip6: fe80::216:36ff:fec5:8a83
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.17
+      mac: 00:16:36:c5:8a:83
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:c5:8a:84
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:ed
-      ip: 172.17.129.17
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT113
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
index 34b31131e1963b455f8c07a5b71c3cafc9a15858..56d49105891cf03e9018e4b3f1b1e788e838ad11 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-18.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-18:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT118
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ec:14
-      ip6: fe80::216:36ff:fe91:ec14
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.18
+      mac: 00:16:36:91:ec:14
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ec:15
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:b9
-      ip: 172.17.129.18
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT118
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
index 0079facb1df7d754efc2fb07fa28fa5dface8a67..6950bc341a41561b82a34c4c5f44e78ac63df304 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-19.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-19:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT126
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:c0
-      ip6: fe80::216:36ff:fe91:eac0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.19
+      mac: 00:16:36:91:ea:c0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:c1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:73
-      ip: 172.17.129.19
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT126
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
index 0a262383199e025c7b9920fafbd47cf8c0c36357..7be62a1970bdd5c9430c45d269082df561156c88 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-2.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-2:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT108
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:84
-      ip6: fe80::216:36ff:fe91:eb84
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.2
+      mac: 00:16:36:91:eb:84
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:85
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:97
-      ip: 172.17.129.2
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT108
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
index ecad2023ba4f96944dfcf66692a8641056cc619f..85ed16c1fe596d01518c3ca9f4499b1b6cfd144d 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-20.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-20:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT11B
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:74
-      ip6: fe80::216:36ff:fe91:e974
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.20
+      mac: 00:16:36:91:e9:74
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:75
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:19
-      ip: 172.17.129.20
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT11B
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
index b321260d6f1a3fa8ee591617056f849c418a20e5..1d69bf88d35a8b7b9636e4bda216f22a6c05a9d6 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-21.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-21:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT11C
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ec:24
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.21
+      mac: 00:16:36:91:ec:24
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ec:25
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac:
-      ip: 172.17.129.21
-  chassis:
-    serial: 0650QBT11C
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
index 16cd66fd9f59c2d00bb47311e3188d31187d1f03..f18b3fdbd375950c98e3aa0ffa00b31e3049a970 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-22.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-22:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT12B
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:d8
-      ip6: fe80::216:36ff:fe91:e9d8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.22
+      mac: 00:16:36:91:e9:d8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:d9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:43
-      ip: 172.17.129.22
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT12B
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
index 74156b002a037d8e764094dc31634b7c17b6c6c7..72a809f87fb566030f243b7e3fe38f062c571a5c 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-23.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-23:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT116
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:1c
-      ip6: fe80::216:36ff:fe91:eb1c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.23
+      mac: 00:16:36:91:eb:1c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:1d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac:
-      ip: 172.17.129.23
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT116
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
index f330774901a3f3b0559744b52ea6b6b6818705e8..895c70c4971aa5db2be0c6b12af02656d950ec38 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-24.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-24:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT129
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:ec
-      ip6: fe80::216:36ff:fe91:e9ec
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.24
+      mac: 00:16:36:91:e9:ec
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:ed
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:47
-      ip: 172.17.129.24
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT129
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
index 4016c69541d7353ed230863663f2cd1d8ee68834..2064f345517a5ba292245bca936170f00dca7348 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-25.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-25:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT11F
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:2c
-      ip6: fe80::216:36ff:fe91:eb2c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.25
+      mac: 00:16:36:91:eb:2c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:2d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f6
-      ip: 172.17.129.25
+      mounted: false
   storage_devices:
     sda:
-      model: SEAGATE ST32500N
       device: sda
-      size: 250059350016
+      model: SEAGATE ST32500N
       rev: 3.0
-      vendor: Seagate
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT11F
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
index c9991ec1e2dfeb240e7801725add8ea5e62331e1..9c8b9742eb19f698b8c09ad000993f3f2c82b5cf 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-26.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-26:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT124
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:d4
-      ip6: fe80::216:36ff:fe91:ebd4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.26
+      mac: 00:16:36:91:eb:d4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:d5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:99
-      ip: 172.17.129.26
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT124
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
index 24cd9893bf562f4dea274e87251c67e6c7c67a25..8c9506479feb0c452dea82592527745f04a3bb85 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-27.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-27:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT106
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:f0
-      ip6: fe80::216:36ff:fe91:e9f0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.27
+      mac: 00:16:36:91:e9:f0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:f1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:48
-      ip: 172.17.129.27
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT106
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
index 60c9137b1677be89c531466f573d51d50b572153..557cb22def6394c51ad24bf748543f6497ee00c7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-28.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-28:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT12A
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:2c
-      ip6: fe80::216:36ff:fe91:e82c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.28
+      mac: 00:16:36:91:e8:2c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e8:2d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:df
-      ip: 172.17.129.28
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT12A
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
index f441694a9af603ed62dcb061c055d2c80c2e2efb..ec84f5954c56848cd77ce76ffdbb1e4942ac6877 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-29.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-29:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT127
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:49:87
-      ip6: fe80::260:ddff:fe47:4987
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.29
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:dc
-      ip6: fe80::216:36ff:fe91:e8dc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.29
+      mac: 00:16:36:91:e8:dc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e8:dd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:27
-      ip: 172.17.129.29
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT127
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
index 1a856384c18d8f87b87d41b7d139b744bcf12d38..801a29468655bbf2ed4f85d034adf96d2c1c1b81 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-30.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-30:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT136
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:0d:c3
-      ip6: fe80::260:ddff:fe47:dc3
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.30
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:94
-      ip6: fe80::216:36ff:fe91:ea94
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.30
+      mac: 00:16:36:91:ea:94
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:95
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:7b
-      ip: 172.17.129.30
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT136
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
index e4a2604c8ab3d515768c09bfb1e381d9cedac79c..5111b5ecf870b19f53dda70200f64f785b632da1 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-31.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-31:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10D
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:0d:bf
-      ip6: fe80::260:ddff:fe47:dbf
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.31
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c9:f9:80
-      ip6: fe80::216:36ff:fec9:f980
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.31
+      mac: 00:16:36:c9:f9:80
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:c9:f9:81
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:ca:0a:7e
-      ip: 172.17.129.31
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT10D
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
index 29add49c8d97810c05170130ff4318f5473a4b2a..6cf5780050f8d36f06817bdf4e3525156571ab2a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-32.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-32:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT122
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:43
-      ip6: fe80::260:ddff:fe47:4c43
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.32
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:94
-      ip6: fe80::216:36ff:fe91:e994
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.32
+      mac: 00:16:36:91:e9:94
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:95
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:08
-      ip: 172.17.129.32
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT122
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
index 5351934405cfd95de02714adc63f1e8fa5df0227..ee4be9fc91c3a9389dbad0dd62eb9ff1982e4bb6 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-33.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-33:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT125
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:44
-      ip6: fe80::260:ddff:fe47:4c44
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.33
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:84
-      ip6: fe80::216:36ff:fe91:ea84
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.33
+      mac: 00:16:36:91:ea:84
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:85
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:72
-      ip: 172.17.129.33
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT125
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
index 975fb327a91ca64ed3047ad57438bf2646ed944b..ff0eb2797b11682ea0756094b47f4979cbcfabb7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-34.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-34:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT114
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:42
-      ip6: fe80::260:ddff:fe47:4c42
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.34
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:dc
-      ip6: fe80::216:36ff:fe91:ebdc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.34
+      mac: 00:16:36:91:eb:dc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:dd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:9f
-      ip: 172.17.129.34
+      mounted: false
   storage_devices:
     sda:
-      model: SEAGATE ST32500N
       device: sda
-      size: 250059350016
+      model: SEAGATE ST32500N
       rev: 3.0
-      vendor: Seagate
-  chassis:
-    serial: 0650QBT114
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250059350016
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
index f89c0666aa790289c55a2cec6237fb75d087a710..53c7e778e0634fd9e32b78b5494501d03576880d 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-35.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-35:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT112
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:69
-      ip6: fe80::260:ddff:fe47:4c69
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.35
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:08
-      ip6: fe80::216:36ff:fe91:ea08
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.35
+      mac: 00:16:36:91:ea:08
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:09
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f1
-      ip: 172.17.129.35
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT112
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
index 545c01567122febaa2afd847bf2a1857182b10c2..fe4ac04fbae4f3336a090e81b9b7da4fc5818fec 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-37.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-37:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT120
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6d
-      ip6: fe80::260:ddff:fe47:4c6d
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.37
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:a4
-      ip6: fe80::216:36ff:fe91:e9a4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.37
+      mac: 00:16:36:91:e9:a4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:a5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:0c
-      ip: 172.17.129.37
-  chassis:
-    serial: 0650QBT120
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
index edb5faaec1500b14a62b5f69cdfabcbc6dc6fbaa..92b7ed8ec2b92a1be2a5312ae01058363f4c68d2 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-38.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-38:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT123
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:49
-      ip6: fe80::260:ddff:fe47:4c49
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.38
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:6c
-      ip6: fe80::216:36ff:fe91:e86c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.38
+      mac: 00:16:36:91:e8:6c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e8:6d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:e1
-      ip: 172.17.129.38
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT123
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
index 69c6badef0bbd4f498716ed400f7618be57a027a..3f8448c37357bbf54a65740d9cdb1d07739a8eeb 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-39.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-39:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10C
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:33
-      ip6: fe80::260:ddff:fe47:4c33
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.39
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ec:20
-      ip6: fe80::216:36ff:fe91:ec20
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.39
+      mac: 00:16:36:91:ec:20
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ec:21
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:bf
-      ip: 172.17.129.39
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT10C
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
index 87954bbf3d980ea237543e0312aa45f30248e03f..5faffa49b7192dcaeeed7955dbb07f94942e73b8 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-4.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-4:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT12C
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:d4
-      ip6: fe80::216:36ff:fe91:e9d4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.4
+      mac: 00:16:36:91:e9:d4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:d5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:41
-      ip: 172.17.129.4
-  chassis:
-    serial: 0650QBT12C
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
index ac0cded69ca780ffb889d7d00145d05acba35f55..956ea78a5c61e8ba6ef76462b6672cd52ade9ea0 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-40.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-40:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT11D
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:6e
-      ip6: fe80::260:ddff:fe47:4c6e
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.40
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:08
-      ip6: fe80::216:36ff:fe91:eb08
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.40
+      mac: 00:16:36:91:eb:08
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:09
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:eb
-      ip: 172.17.129.40
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT11D
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
index dd03cf169c3b299c1eb340c271b9f1e16d161e84..f62a32a66316f23f92d75cdc29bc597093578458 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-41.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-41:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT12D
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4d:2d
-      ip6: fe80::260:ddff:fe47:4d2d
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.41
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:f8
-      ip6: fe80::216:36ff:fe91:eaf8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.41
+      mac: 00:16:36:91:ea:f8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:f9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:e7
-      ip: 172.17.129.41
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT12D
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
index 398b6a7211372faf020c5f41d5f560d1c150890c..37ec32640b51fa3fa9e50a884eca0d34099297ae 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-43.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-43:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT12F
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:48
-      ip6: fe80::260:ddff:fe47:4c48
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.43
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:fc
-      ip6: fe80::216:36ff:fe91:eafc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.43
+      mac: 00:16:36:91:ea:fc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:fd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:e8
-      ip: 172.17.129.43
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT12F
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
index 39d8b29f13a13aeb32dee5e42089c71875bee7ec..5bfcac0cce56f501934043036e0fa55cc2baf49a 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-44.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-44:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT10B
+  main_memory:
+    ram_size: 4156555264
   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.44
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:18
-      ip6: fe80::216:36ff:fe91:e918
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.44
+      mac: 00:16:36:91:e9:18
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:19
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:33
-      ip: 172.17.129.44
-  chassis:
-    serial: 0650QBT10B
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
index 218e97093dc70458c74bac66c8e0b669407ff62f..7f7f9de96f229c29e7346756f9628189935fddd0 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-45.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-45:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT135
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:35
-      ip6: fe80::260:ddff:fe47:4c35
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.45
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:58
-      ip6: fe80::216:36ff:fe91:e958
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.45
+      mac: 00:16:36:91:e9:58
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:59
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:12
-      ip: 172.17.129.45
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT135
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
index 6ea6b5aa995cddc6c95a2872f7bee3e34ce966b6..f6601fb111b23326f254b6183ca774d269b28818 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-46.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-46:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT131
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:47
-      ip6: fe80::260:ddff:fe47:4c47
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.46
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:80
-      ip6: fe80::216:36ff:fe91:eb80
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.46
+      mac: 00:16:36:91:eb:80
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:81
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:96
-      ip: 172.17.129.46
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT131
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
index 81a37218b1deb103b08b3ba152153444962d5370..5835523cdde6a2a5e79dbaf2de4cf86c2eac630d 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-48.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-48:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT133
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:46
-      ip6: fe80::260:ddff:fe47:4c46
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.48
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:eb:28
-      ip6: fe80::216:36ff:fe91:eb28
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.48
+      mac: 00:16:36:91:eb:28
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:eb:29
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:91:f6:f5
-      ip: 172.17.129.48
-  chassis:
-    serial: 0650QBT133
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
index 068afa896d5163940ebc8e2552eca34eab60055e..0386b2c4854367515fd514698546591e419097e5 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-5.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-5:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT107
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:e8
-      ip6: fe80::216:36ff:fe91:e8e8
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.5
+      mac: 00:16:36:91:e8:e8
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e8:e9
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:2a
-      ip: 172.17.129.5
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  chassis:
-    serial: 0650QBT107
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
index 292268ddd37ea886966fc9a8e4f740fac2e0bd29..df9930c5a9960747bc220ed6e85475a78eb5a227 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-50.yaml
@@ -1,74 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-50:
+  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
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: xxxxxxxxxx
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
-    myri0:
-      mounted: true
-      rate: 10000000000
-      mac: 00:60:dd:47:4c:30
-      ip6: fe80::260:ddff:fe47:4c30
-      management: false
-      enabled: true
-      interface: Myrinet
-      ip: 172.18.129.50
-      driver: mx ethernet (myri)
-      mountable: true
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:e0
-      ip6: fe80::216:36ff:fe91:e9e0
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.50
+      mac: 00:16:36:91:e9:e0
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:e1
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:44
-      ip: 172.17.129.50
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: xxxxxxxxxx
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
index 76a59ecdfaf4a8420fe10ad0b876b414ca1afe1f..343e1e104f7d118fd9f8e23e05650034af0d03c7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-6.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-6:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: A9CA
-      vendor: Hitachi
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT130
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e8:70
-      ip6: fe80::216:36ff:fe91:e870
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.6
+      mac: 00:16:36:91:e8:70
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e8:71
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:92:e3
-      ip: 172.17.129.6
-  chassis:
-    serial: 0650QBT130
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: HITACHI HDS7225S
+      rev: A9CA
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
index 752070621e541dfcc729576ddf087e7082a9e8de..774b003387a6656b74c43616a46eaec62fb025d1 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-7.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-7:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT109
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:ea:d4
-      ip6: fe80::216:36ff:fe91:ead4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.7
+      mac: 00:16:36:91:ea:d4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:ea:d5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:7c
-      ip: 172.17.129.7
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 0650QBT109
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
index 456c04f60bcb00648fdb77d0024a5ac8c875fa3a..db7a11218f089d11c728c6aa9836c7028dbed0b7 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-8.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-8:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT115
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:c5:8a:87
-      ip6: fe80::216:36ff:fec5:8a87
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.8
+      mac: 00:16:36:c5:8a:87
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:c5:8a:88
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:ee
-      ip: 172.17.129.8
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT115
-    manufacturer: Sun Microsystems
-    name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 4293918720
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
index 4efd7e33caed49a2c766ed8b11c4744cc8c859ee..ce20c9fcb6e525db6a81e7047d2d6b72bdd8808d 100644
--- a/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/sol/nodes/sol-9.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 sol-9:
+  architecture:
+    platform_type: x86_64
+    smp_size: 2
+    smt_size: 4
   bios:
-    version: S39_3B13
     release_date: 12/13/2006
     vendor: Sun Microsystems
+    version: S39_3B13
+  chassis:
+    manufacturer: Sun Microsystems
+    name: Sun Fire X2200 M2
+    serial: 0650QBT128
+  main_memory:
+    ram_size: 4156555264
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:91:e9:90
-      ip6: fe80::216:36ff:fe91:e990
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: forcedeth
-      mountable: true
+      interface: Ethernet
       ip: 172.16.129.9
+      mac: 00:16:36:91:e9:90
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: forcedeth
+      interface: Ethernet
       mac: 00:16:36:91:e9:91
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-    bmc:
-      mac: 00:16:36:c5:93:07
-      ip: 172.17.129.9
+      mounted: false
   storage_devices:
     sda:
-      model: HITACHI HDS7225S
       device: sda
-      size: 250056000000
+      model: HITACHI HDS7225S
       rev: A9CA
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      size: 250056000000
   supported_job_types:
     virtual: amd-v
-  chassis:
-    serial: 0650QBT128
-    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_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/input/grid5000/sites/sophia/clusters/sol/sol_diff.yaml b/input/grid5000/sites/sophia/clusters/sol/sol_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..31e5d534d56459ff2927d04846773b45b7516ed0
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/sol/sol_diff.yaml
@@ -0,0 +1,602 @@
+---
+nodes:
+  sol-[1-50]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    processor:
+      cache_l1d: 65536
+      cache_l1i: 65536
+      cache_l2: 1048576
+      cache_l3: 0
+      clock_speed: 2600000000
+      instruction_set: x86-64
+      model: AMD Opteron
+      other_description: Dual-Core AMD Opteron(tm) Processor 2218
+      vendor: AMD
+      version: 2218
+    storage_devices:
+      sda:
+        vendor: Hitachi
+
+  sol-1:
+    chassis:
+      serial: 0650QBT132
+    network_adapters:
+      bmc:
+        ip: 172.17.129.1
+        mac: 00:16:36:c5:92:c8
+      eth0:
+        ip6: fe80::216:36ff:fe91:e7d0
+  sol-10:
+    chassis:
+      serial: 0650QBT12E
+    network_adapters:
+      bmc:
+        ip: 172.17.129.10
+        mac: 00:16:36:c5:93:9a
+      eth0:
+        ip6: fe80::216:36ff:fe91:ebd0
+  sol-11:
+    chassis:
+      serial: 0650QBT134
+    network_adapters:
+      bmc:
+        ip: 172.17.129.11
+        mac: 00:16:36:c5:93:42
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9dc
+  sol-12:
+    chassis:
+      serial: 0650QBT10A
+    network_adapters:
+      bmc:
+        ip: 172.17.129.12
+        mac: 00:16:36:c5:93:8e
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb60
+  sol-13:
+    chassis:
+      serial: 0650QBT111
+    network_adapters:
+      bmc:
+        ip: 172.17.129.13
+        mac: 00:16:36:c5:92:d9
+      eth0:
+        ip6: fe80::216:36ff:fe91:e85c
+  sol-14:
+    chassis:
+      serial: 0650QBT119
+    network_adapters:
+      bmc:
+        ip: 172.17.129.14
+        mac: 00:16:36:ca:0b:1a
+      eth0:
+        ip6: fe80::216:36ff:fec9:fbe4
+  sol-15:
+    chassis:
+      serial: 0650QBT11A
+    network_adapters:
+      bmc:
+        ip: 172.17.129.15
+        mac: 00:16:36:ca:0a:cb
+      eth0:
+        ip6: fe80::216:36ff:fec9:fb34
+  sol-16:
+    chassis:
+      serial: 0650QBT10F
+    network_adapters:
+      bmc:
+        ip: 172.17.129.16
+        mac: 00:16:36:ca:0b:06
+      eth0:
+        ip6: fe80::216:36ff:fec9:fb94
+  sol-17:
+    chassis:
+      serial: 0650QBT113
+    network_adapters:
+      bmc:
+        ip: 172.17.129.17
+        mac: 00:16:36:c5:93:ed
+      eth0:
+        ip6: fe80::216:36ff:fec5:8a83
+  sol-18:
+    chassis:
+      serial: 0650QBT118
+    network_adapters:
+      bmc:
+        ip: 172.17.129.18
+        mac: 00:16:36:c5:93:b9
+      eth0:
+        ip6: fe80::216:36ff:fe91:ec14
+  sol-19:
+    chassis:
+      serial: 0650QBT126
+    network_adapters:
+      bmc:
+        ip: 172.17.129.19
+        mac: 00:16:36:c5:93:73
+      eth0:
+        ip6: fe80::216:36ff:fe91:eac0
+  sol-2:
+    chassis:
+      serial: 0650QBT108
+    network_adapters:
+      bmc:
+        ip: 172.17.129.2
+        mac: 00:16:36:c5:93:97
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb84
+  sol-20:
+    chassis:
+      serial: 0650QBT11B
+    network_adapters:
+      bmc:
+        ip: 172.17.129.20
+        mac: 00:16:36:c5:93:19
+      eth0:
+        ip6: fe80::216:36ff:fe91:e974
+  sol-21:
+    chassis:
+      serial: 0650QBT11C
+    network_adapters:
+      bmc:
+        ip: 172.17.129.21
+        mac: 
+      eth0:
+        ip6: fe80::216:36ff:fe91:e918
+  sol-22:
+    chassis:
+      serial: 0650QBT12B
+    network_adapters:
+      bmc:
+        ip: 172.17.129.22
+        mac: 00:16:36:c5:93:43
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9d8
+  sol-23:
+    chassis:
+      serial: 0650QBT116
+    network_adapters:
+      bmc:
+        ip: 172.17.129.23
+        mac: 
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb1c
+  sol-24:
+    chassis:
+      serial: 0650QBT129
+    network_adapters:
+      bmc:
+        ip: 172.17.129.24
+        mac: 00:16:36:c5:93:47
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9ec
+  sol-25:
+    chassis:
+      serial: 0650QBT11F
+    network_adapters:
+      bmc:
+        ip: 172.17.129.25
+        mac: 00:16:36:91:f6:f6
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb2c
+    storage_devices:
+      sda:
+        vendor: Seagate
+  sol-26:
+    chassis:
+      serial: 0650QBT124
+    network_adapters:
+      bmc:
+        ip: 172.17.129.26
+        mac: 00:16:36:c5:93:99
+      eth0:
+        ip6: fe80::216:36ff:fe91:ebd4
+  sol-27:
+    chassis:
+      serial: 0650QBT106
+    network_adapters:
+      bmc:
+        ip: 172.17.129.27
+        mac: 00:16:36:c5:93:48
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9f0
+  sol-28:
+    chassis:
+      serial: 0650QBT12A
+    network_adapters:
+      bmc:
+        ip: 172.17.129.28
+        mac: 00:16:36:c5:92:df
+      eth0:
+        ip6: fe80::216:36ff:fe91:e82c
+  sol-29:
+    chassis:
+      serial: 0650QBT127
+    network_adapters:
+      bmc:
+        ip: 172.17.129.29
+        mac: 00:16:36:c5:93:27
+      eth0:
+        ip6: fe80::216:36ff:fe91:e8dc
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.29
+        ip6: fe80::260:ddff:fe47:4987
+        mac: 00:60:dd:47:49:87
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-30:
+    chassis:
+      serial: 0650QBT136
+    network_adapters:
+      bmc:
+        ip: 172.17.129.30
+        mac: 00:16:36:c5:93:7b
+      eth0:
+        ip6: fe80::216:36ff:fe91:ea94
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.30
+        ip6: fe80::260:ddff:fe47:dc3
+        mac: 00:60:dd:47:0d:c3
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-31:
+    chassis:
+      serial: 0650QBT10D
+    network_adapters:
+      bmc:
+        ip: 172.17.129.31
+        mac: 00:16:36:ca:0a:7e
+      eth0:
+        ip6: fe80::216:36ff:fec9:f980
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.31
+        ip6: fe80::260:ddff:fe47:dbf
+        mac: 00:60:dd:47:0d:bf
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-32:
+    chassis:
+      serial: 0650QBT122
+    network_adapters:
+      bmc:
+        ip: 172.17.129.32
+        mac: 00:16:36:c5:93:08
+      eth0:
+        ip6: fe80::216:36ff:fe91:e994
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.32
+        ip6: fe80::260:ddff:fe47:4c43
+        mac: 00:60:dd:47:4c:43
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-33:
+    chassis:
+      serial: 0650QBT125
+    network_adapters:
+      bmc:
+        ip: 172.17.129.33
+        mac: 00:16:36:c5:93:72
+      eth0:
+        ip6: fe80::216:36ff:fe91:ea84
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.33
+        ip6: fe80::260:ddff:fe47:4c44
+        mac: 00:60:dd:47:4c:44
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-34:
+    chassis:
+      serial: 0650QBT114
+    network_adapters:
+      bmc:
+        ip: 172.17.129.34
+        mac: 00:16:36:c5:93:9f
+      eth0:
+        ip6: fe80::216:36ff:fe91:ebdc
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.34
+        ip6: fe80::260:ddff:fe47:4c42
+        mac: 00:60:dd:47:4c:42
+        management: false
+        mounted: true
+        rate: 10000000000
+    storage_devices:
+      sda:
+        vendor: Seagate
+  sol-35:
+    chassis:
+      serial: 0650QBT112
+    network_adapters:
+      bmc:
+        ip: 172.17.129.35
+        mac: 00:16:36:91:f6:f1
+      eth0:
+        ip6: fe80::216:36ff:fe91:ea08
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.35
+        ip6: fe80::260:ddff:fe47:4c69
+        mac: 00:60:dd:47:4c:69
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-37:
+    chassis:
+      serial: 0650QBT120
+    network_adapters:
+      bmc:
+        ip: 172.17.129.37
+        mac: 00:16:36:c5:93:0c
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9a4
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.37
+        ip6: fe80::260:ddff:fe47:4c6d
+        mac: 00:60:dd:47:4c:6d
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-38:
+    chassis:
+      serial: 0650QBT123
+    network_adapters:
+      bmc:
+        ip: 172.17.129.38
+        mac: 00:16:36:c5:92:e1
+      eth0:
+        ip6: fe80::216:36ff:fe91:e86c
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.38
+        ip6: fe80::260:ddff:fe47:4c49
+        mac: 00:60:dd:47:4c:49
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-39:
+    chassis:
+      serial: 0650QBT10C
+    network_adapters:
+      bmc:
+        ip: 172.17.129.39
+        mac: 00:16:36:c5:93:bf
+      eth0:
+        ip6: fe80::216:36ff:fe91:ec20
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.39
+        ip6: fe80::260:ddff:fe47:4c33
+        mac: 00:60:dd:47:4c:33
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-4:
+    chassis:
+      serial: 0650QBT12C
+    network_adapters:
+      bmc:
+        ip: 172.17.129.4
+        mac: 00:16:36:c5:93:41
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9d4
+  sol-40:
+    chassis:
+      serial: 0650QBT11D
+    network_adapters:
+      bmc:
+        ip: 172.17.129.40
+        mac: 00:16:36:91:f6:eb
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb08
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.40
+        ip6: fe80::260:ddff:fe47:4c6e
+        mac: 00:60:dd:47:4c:6e
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-41:
+    chassis:
+      serial: 0650QBT12D
+    network_adapters:
+      bmc:
+        ip: 172.17.129.41
+        mac: 00:16:36:91:f6:e7
+      eth0:
+        ip6: fe80::216:36ff:fe91:eaf8
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.41
+        ip6: fe80::260:ddff:fe47:4d2d
+        mac: 00:60:dd:47:4d:2d
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-43:
+    chassis:
+      serial: 0650QBT12F
+    network_adapters:
+      bmc:
+        ip: 172.17.129.43
+        mac: 00:16:36:91:f6:e8
+      eth0:
+        ip6: fe80::216:36ff:fe91:eafc
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.43
+        ip6: fe80::260:ddff:fe47:4c48
+        mac: 00:60:dd:47:4c:48
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-44:
+    chassis:
+      serial: 0650QBT10B
+    network_adapters:
+      bmc:
+        ip: 172.17.129.44
+        mac: 00:16:36:c5:93:33
+      eth0:
+        ip6: fe80::216:36ff:fe91:e918
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.44
+        ip6: fe80::260:ddff:fe47:4c45
+        mac: 00:60:dd:47:4c:45
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-45:
+    chassis:
+      serial: 0650QBT135
+    network_adapters:
+      bmc:
+        ip: 172.17.129.45
+        mac: 00:16:36:c5:93:12
+      eth0:
+        ip6: fe80::216:36ff:fe91:e958
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.45
+        ip6: fe80::260:ddff:fe47:4c35
+        mac: 00:60:dd:47:4c:35
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-46:
+    chassis:
+      serial: 0650QBT131
+    network_adapters:
+      bmc:
+        ip: 172.17.129.46
+        mac: 00:16:36:c5:93:96
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb80
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.46
+        ip6: fe80::260:ddff:fe47:4c47
+        mac: 00:60:dd:47:4c:47
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-48:
+    chassis:
+      serial: 0650QBT133
+    network_adapters:
+      bmc:
+        ip: 172.17.129.48
+        mac: 00:16:36:91:f6:f5
+      eth0:
+        ip6: fe80::216:36ff:fe91:eb28
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.48
+        ip6: fe80::260:ddff:fe47:4c46
+        mac: 00:60:dd:47:4c:46
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-5:
+    chassis:
+      serial: 0650QBT107
+    network_adapters:
+      bmc:
+        ip: 172.17.129.5
+        mac: 00:16:36:c5:93:2a
+      eth0:
+        ip6: fe80::216:36ff:fe91:e8e8
+  sol-50:
+    chassis:
+      serial: xxxxxxxxxx
+    network_adapters:
+      bmc:
+        ip: 172.17.129.50
+        mac: 00:16:36:c5:93:44
+      eth0:
+        ip6: fe80::216:36ff:fe91:e9e0
+      myri0:
+        driver: mx ethernet (myri)
+        interface: Myrinet
+        ip: 172.18.129.50
+        ip6: fe80::260:ddff:fe47:4c30
+        mac: 00:60:dd:47:4c:30
+        management: false
+        mounted: true
+        rate: 10000000000
+  sol-6:
+    chassis:
+      serial: 0650QBT130
+    network_adapters:
+      bmc:
+        ip: 172.17.129.6
+        mac: 00:16:36:c5:92:e3
+      eth0:
+        ip6: fe80::216:36ff:fe91:e870
+  sol-7:
+    chassis:
+      serial: 0650QBT109
+    network_adapters:
+      bmc:
+        ip: 172.17.129.7
+        mac: 00:16:36:c5:93:7c
+      eth0:
+        ip6: fe80::216:36ff:fe91:ead4
+  sol-8:
+    chassis:
+      serial: 0650QBT115
+    network_adapters:
+      bmc:
+        ip: 172.17.129.8
+        mac: 00:16:36:c5:93:ee
+      eth0:
+        ip6: fe80::216:36ff:fec5:8a87
+  sol-9:
+    chassis:
+      serial: 0650QBT128
+    network_adapters:
+      bmc:
+        ip: 172.17.129.9
+        mac: 00:16:36:c5:93:07
+      eth0:
+        ip6: fe80::216:36ff:fe91:e990
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
index 99d494669b7fe4834be25f2dbe391cba4fa1d031..3124e81da0a5e03fb2f1719b34c8fcbbbc2c331b 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-11.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-11:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: H3JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:0c
-      ip6: fe80::226:b9ff:fe3f:470c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.11
+      mac: 00:26:b9:3f:47:0c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:47:0d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:0e
-      ip: 172.17.130.11
-  chassis:
-    serial: H3JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
index d8d09667536d70a815ff257de3556b8325253395..c9f94472539ee2a4d892579315c4643a702508d6 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-14.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-14:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 95JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:61
-      ip6: fe80::226:b9ff:fe3f:4a61
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.14
+      mac: 00:26:b9:3f:4a:61
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4a:62
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:63
-      ip: 172.17.130.14
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 95JPH4J
-    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-15.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
index 999406bb86b6911a12057973e84f326f0e3f81d4..add023fe50b2dac32e3884d08a2a5c315ae1622a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-15.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-15:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: F3JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:44:89
-      ip6: fe80::226:b9ff:fe3f:4489
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.15
+      mac: 00:26:b9:3f:44:89
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:44:8a
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:44:8b
-      ip: 172.17.130.15
-  chassis:
-    serial: F3JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
index 20229b953aa8d4bb6c21e3ebb321e64b28af353d..ebeff7d60128239bd0b4d8f396a859455d552e74 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-17.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-17:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 54JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:db
-      ip6: fe80::226:b9ff:fe3f:47db
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.17
+      mac: 00:26:b9:3f:47:db
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:47:dc
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:dd
-      ip: 172.17.130.17
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 54JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
index 0289067db0dea9fedf3868d87a4cc8702b508b30..08a03d9b61060c45b9a7418c2ffb433d62074a1f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-18.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-18:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 13JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:35:c4:83
-      ip6: fe80::226:b9ff:fe35:c483
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.18
+      mac: 00:26:b9:35:c4:83
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:35:c4:84
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:35:c4:85
-      ip: 172.17.130.18
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
-  chassis:
-    serial: 13JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
index b0561991f7c23305e669d4b28a890cf594ee299a..3f270efb4c8f306189545c3eff48814bd576b95d 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-19.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-19:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 74JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:40:67
-      ip6: fe80::226:b9ff:fe3f:4067
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.19
+      mac: 00:26:b9:3f:40:67
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:40:68
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:40:69
-      ip: 172.17.130.19
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 74JPH4J
-    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-2.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
index 6691e5323af476a62cb283c718d9f1ad937baca4..434352396a8a7752e49c622ab59f4e0a24c5c98e 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-2.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-2:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: B5JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:38
-      ip6: fe80::226:b9ff:fe3f:4938
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.2
+      mac: 00:26:b9:3f:49:38
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:49:39
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:3a
-      ip: 172.17.130.2
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: B5JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
index bbe6f45a3bd3a22d590daf756f45c7f512f56268..c2d317ce14134f91b9b2882a583c0ed98c7b9298 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-20.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-20:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 43JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:46:12
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.20
+      mac: 00:26:b9:3f:46:12
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:46:13
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:46:14
-      ip: 172.17.130.20
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 43JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
index 105d2dcb2270e15509d498f07550a33b21fd5a52..adc3d8ffc4a2e00c5639969dd2d5b1befcb03629 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-22.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-22:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 55JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:66
-      ip6: fe80::226:b9ff:fe3f:4766
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.22
+      mac: 00:26:b9:3f:47:66
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:47:67
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:68
-      ip: 172.17.130.22
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 55JPH4J
-    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-23.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
index d7cc933888c1d74e2c8aab32c03df211a4b7fb52..f32381f9f45788fa387c6aa2bdefed60bb898006 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-23.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-23:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: C5JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:dc
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.23
+      mac: 00:26:b9:3f:4a:dc
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4a:dd
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:de
-      ip: 172.17.130.23
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: C5JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
index 82344ebcc5345a5fdd104bd2acd5dd565470fae8..20535ad96ee293f95dd081b586c7ae2c1377b265 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-24.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-24:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 24JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:b4
-      ip6: fe80::226:b9ff:fe3f:47b4
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.24
+      mac: 00:26:b9:3f:47:b4
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:47:b5
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:b6
-      ip: 172.17.130.24
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: 24JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
index 885b2d939e1e0dd18a86ba3616acc44cef60c8d5..8cc005de26f65a8f6f6af4b8bfb9714c38bb70c9 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-26.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-26:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 75JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:4d
-      ip6: fe80::226:b9ff:fe3f:4b4d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.26
+      mac: 00:26:b9:3f:4b:4d
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4b:4e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:4f
-      ip: 172.17.130.26
-  chassis:
-    serial: 75JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
index 5707e38cb88e0a3f357d9a861712db2a39be4b01..83347a0d52e029b4a78c78bf21ef7c00a1faf014 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-28.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-28:
+  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
-      device: sda
-      size: 299439751168
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: F4JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:56
-      ip6: fe80::226:b9ff:fe3f:4956
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.28
+      mac: 00:26:b9:3f:49:56
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:49:57
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:58
-      ip: 172.17.130.28
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 299439751168
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: F4JPH4J
-    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-30.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
index b72ae5c14bac04f98383d174fbc0dd6ca1310ad5..3c3dd741a12796d217e88185001ee08d996b267a 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-30.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-30:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 63JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:30
-      ip6: fe80::226:b9ff:fe3f:4130
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.30
+      mac: 00:26:b9:3f:41:30
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:41:31
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:32
-      ip: 172.17.130.30
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 63JPH4J
-    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-31.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
index 100f2424b5e2540bb8c33b7513dc7b409c1a60c3..b9d01dc0a2f23b3dca8d78b794571271aa3018e2 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-31.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-31:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: C4JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:56
-      ip6: fe80::226:b9ff:fe3f:4b56
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.31
+      mac: 00:26:b9:3f:4b:56
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4b:57
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:58
-      ip: 172.17.130.31
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: C4JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
index e81ff6ae6a41345a3f6483d626e449aad263c074..3ee931489db10e45d8b67c060351f4d6958e9424 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-32.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-32:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: F5JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:44:68
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.32
+      mac: 00:26:b9:3f:44:68
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:44:69
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:44:6a
-      ip: 172.17.130.32
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: F5JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
index b0ba693af102735415e9064f56e37616d3564908..7a59c1f59449f9d4084000e54c64fbdcb9b7f4f3 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-33.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-33:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 84JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3f:67
-      ip6: fe80::226:b9ff:fe3f:3f67
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.33
+      mac: 00:26:b9:3f:3f:67
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:3f:68
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3f:69
-      ip: 172.17.130.33
-  chassis:
-    serial: 84JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   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-34.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
index 142220599999e01d754c0d6e72e2642629ae8fcb..213a49123e510309a5c2b2641e964a0af8a414c0 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-34.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-34:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 53JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:5f
-      ip6: fe80::226:b9ff:fe3f:495f
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.34
+      mac: 00:26:b9:3f:49:5f
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:49:60
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:61
-      ip: 172.17.130.34
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 53JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
index 1adb61c0e5f6be026578a33b12b07794a012a80d..590bacf2e18702164f7b9cdc3b82da8f205b00bb 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-35.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-35:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: B4JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3f:1c
-      ip6: fe80::226:b9ff:fe3f:3f1c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.35
+      mac: 00:26:b9:3f:3f:1c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:3f:1d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3f:1e
-      ip: 172.17.130.35
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: B4JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
index 2696ae74335858da0de9456f12cf21406eaebc0d..d43e2c0c6fe4153ad18ed9393f395f78f9e0d9da 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-36.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-36:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 94JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:94
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.36
+      mac: 00:26:b9:3f:4a:94
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4a:95
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:96
-      ip: 172.17.130.36
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 94JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
index f3dab6f3706fd3d204f376d5b954090ab521a687..32826e8fc61a4e31c33462e269a78e44a9fcfdc2 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-37.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-37:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: H4JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4b:2c
-      ip6: fe80::226:b9ff:fe3f:4b2c
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.37
+      mac: 00:26:b9:3f:4b:2c
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4b:2d
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4b:2e
-      ip: 172.17.130.37
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: H4JPH4J
-    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-38.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
index 8ba71fd4c3384054acd38e9ae1bb2ab2c495957d..74e81ad68afe2f2ae701156228e48e1389994321 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-38.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-38:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 34JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:44:b3
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.38
+      mac: 00:26:b9:3f:44:b3
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:44:b4
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:44:b5
-      ip: 172.17.130.38
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 34JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
index 177b368d0f3c358bc8fdb8405d1aa4a9bcd7dd7f..82f2c7a5049c75b087a9c8427b558c4613ba86c7 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-4.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-4:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: D5JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:6d
-      ip6: fe80::226:b9ff:fe3f:4a6d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.4
+      mac: 00:26:b9:3f:4a:6d
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4a:6e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:6f
-      ip: 172.17.130.4
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial: D5JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   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-40.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
index ba73802f8754e53cf7836282a22cba029cd54933..e5d4c735e98a8c74f228afbcfbbc123361a6e240 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-40.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-40:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 65JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:49:44
-      ip6: fe80::226:b9ff:fe3f:4944
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.40
+      mac: 00:26:b9:3f:49:44
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:49:45
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:49:46
-      ip: 172.17.130.40
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
-  chassis:
-    serial: 65JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 598879502336
   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-41.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
index dc4210bdca31ba6356d6b2e0b20503aa34044ed5..6036b90f22b37426656fb7a54084be9086ed2290 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-41.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-41:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: J3JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:45:3a
-      ip6: fe80::226:b9ff:fe3f:453a
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.41
+      mac: 00:26:b9:3f:45:3a
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:45:3b
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:45:3c
-      ip: 172.17.130.41
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
-  chassis:
-    serial: J3JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
index c5325896c002e3065fccbd293075a17add190638..9402da5793c0143a28df3aa911264ce33c8e9c22 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-42.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-42:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 93JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:41:21
-      ip6: fe80::226:b9ff:fe3f:4121
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.42
+      mac: 00:26:b9:3f:41:21
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:41:22
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:41:23
-      ip: 172.17.130.42
-  chassis:
-    serial: 93JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   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-43.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
index 885e03badd0b0771ff886036893bc5f2724b8ca9..2a0eff250ac4eef14cac00502934d4ba7690fb4c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-43.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-43:
+  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
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 23JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:3e:95
-      ip6: fe80::226:b9ff:fe3f:3e95
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.43
+      mac: 00:26:b9:3f:3e:95
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:3e:96
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:3e:97
-      ip: 172.17.130.43
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
   storage_devices:
     sda:
-      model: PERC 6/i Adapter
       device: sda
-      size: 598879502336
+      model: PERC 6/i Adapter
       rev: 1.22
-      vendor: Dell
-  chassis:
-    serial: 23JPH4J
-    manufacturer: Dell Inc.
-    name: PowerEdge R410
+      size: 598879502336
   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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
index c571aa75790d21569ad15623af70f510d2b31131..a21b493bb5d2404c16536b96f7bd41cfd715337f 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-45.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-45:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 25JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:47:7b
-      ip6: fe80::226:b9ff:fe3f:4adc
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.45
+      mac: 00:26:b9:3f:47:7b
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:47:7c
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:47:7d
-      ip: 172.17.130.45
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 25JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
index 7f2dda39f06d7920af2c100cdcd67b9a292fa13e..0b62241c467bc3f804a65891617da1785feffd67 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-7.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-7:
+  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: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  storage_devices:
-    sda:
-      model: PERC 6/i Adapter
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: 64JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:43:a1
-      ip6: fe80::226:b9ff:fe3f:43a1
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.7
+      mac: 00:26:b9:3f:43:a1
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:43:a2
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:43:a3
-      ip: 172.17.130.7
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: 64JPH4J
-    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_l2: 262144
-    cache_l3: 8388608
-    vendor: Intel
-    instruction_set: x86-64
-    cache_l1i: 32768
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 8
diff --git a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
index c2de4faf04e8f83f1125703df4326da02f662f9d..ae307b160ba4f93c643edba7d0b016cca033b63c 100644
--- a/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/suno/nodes/suno-8.yaml
@@ -1,63 +1,40 @@
+# Generated by g5k-checks (g5k-checks -m api)
 ---
 suno-8:
+  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
-      device: sda
-      size: 598879502336
-      rev: 1.22
-      vendor: Dell
+    version: 1.1
+  chassis:
+    manufacturer: Dell Inc.
+    name: PowerEdge R410
+    serial: C3JPH4J
+  main_memory:
+    ram_size: 33285996544
   network_adapters:
     eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:26:b9:3f:4a:3d
-      ip6: fe80::226:b9ff:fe3f:4a3d
-      management: false
-      enabled: true
-      interface: Ethernet
       driver: bnx2
-      mountable: true
+      interface: Ethernet
       ip: 172.16.130.8
+      mac: 00:26:b9:3f:4a:3d
+      management: false
+      mounted: true
+      rate: 1000000000
     eth1:
-      mounted: false
+      driver: bnx2
+      interface: Ethernet
       mac: 00:26:b9:3f:4a:3e
       management: false
-      enabled: false
-      interface: Ethernet
-      driver: bnx2
-      mountable: false
-    bmc:
-      mac: 00:26:b9:3f:4a:3f
-      ip: 172.17.130.8
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
+      mounted: false
+  storage_devices:
+    sda:
+      device: sda
+      model: PERC 6/i Adapter
+      rev: 1.22
+      size: 598879502336
   supported_job_types:
     virtual: ivt
-  chassis:
-    serial: C3JPH4J
-    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/suno_diff.yaml b/input/grid5000/sites/sophia/clusters/suno/suno_diff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ff4576b1f6e1503fb4639899128cdd9079d1b5b8
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/suno/suno_diff.yaml
@@ -0,0 +1,299 @@
+---
+nodes:
+  suno-[-]:
+    network_adapters:
+      eth0:
+        enabled: true
+        mountable: true
+      eth1:
+        enabled: false
+        mountable: false
+    operating_system:
+      kernel: 2.6.32-5-amd64
+      name: debian
+      version: 6.0.6
+    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:
+        vendor: Dell
+
+  suno-11:
+    chassis:
+      serial: H3JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.11
+        mac: 00:26:b9:3f:47:0e
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:470c
+  suno-14:
+    chassis:
+      serial: 95JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.14
+        mac: 00:26:b9:3f:4a:63
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4a61
+  suno-15:
+    chassis:
+      serial: F3JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.15
+        mac: 00:26:b9:3f:44:8b
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4489
+  suno-17:
+    chassis:
+      serial: 54JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.17
+        mac: 00:26:b9:3f:47:dd
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:47db
+  suno-18:
+    chassis:
+      serial: 13JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.18
+        mac: 00:26:b9:35:c4:85
+      eth0:
+        ip6: fe80::226:b9ff:fe35:c483
+  suno-19:
+    chassis:
+      serial: 74JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.19
+        mac: 00:26:b9:3f:40:69
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4067
+  suno-2:
+    chassis:
+      serial: B5JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.2
+        mac: 00:26:b9:3f:49:3a
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4938
+  suno-20:
+    chassis:
+      serial: 43JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.20
+        mac: 00:26:b9:3f:46:14
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4adc
+  suno-22:
+    chassis:
+      serial: 55JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.22
+        mac: 00:26:b9:3f:47:68
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4766
+  suno-23:
+    chassis:
+      serial: C5JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.23
+        mac: 00:26:b9:3f:4a:de
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4adc
+  suno-24:
+    chassis:
+      serial: 24JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.24
+        mac: 00:26:b9:3f:47:b6
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:47b4
+  suno-26:
+    chassis:
+      serial: 75JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.26
+        mac: 00:26:b9:3f:4b:4f
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4b4d
+  suno-28:
+    chassis:
+      serial: F4JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.28
+        mac: 00:26:b9:3f:49:58
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4956
+  suno-30:
+    chassis:
+      serial: 63JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.30
+        mac: 00:26:b9:3f:41:32
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4130
+  suno-31:
+    chassis:
+      serial: C4JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.31
+        mac: 00:26:b9:3f:4b:58
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4b56
+  suno-32:
+    chassis:
+      serial: F5JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.32
+        mac: 00:26:b9:3f:44:6a
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4adc
+  suno-33:
+    chassis:
+      serial: 84JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.33
+        mac: 00:26:b9:3f:3f:69
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:3f67
+  suno-34:
+    chassis:
+      serial: 53JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.34
+        mac: 00:26:b9:3f:49:61
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:495f
+  suno-35:
+    chassis:
+      serial: B4JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.35
+        mac: 00:26:b9:3f:3f:1e
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:3f1c
+  suno-36:
+    chassis:
+      serial: 94JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.36
+        mac: 00:26:b9:3f:4a:96
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4adc
+  suno-37:
+    chassis:
+      serial: H4JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.37
+        mac: 00:26:b9:3f:4b:2e
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4b2c
+  suno-38:
+    chassis:
+      serial: 34JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.38
+        mac: 00:26:b9:3f:44:b5
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4adc
+  suno-4:
+    chassis:
+      serial: D5JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.4
+        mac: 00:26:b9:3f:4a:6f
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4a6d
+  suno-40:
+    chassis:
+      serial: 65JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.40
+        mac: 00:26:b9:3f:49:46
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4944
+  suno-41:
+    chassis:
+      serial: J3JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.41
+        mac: 00:26:b9:3f:45:3c
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:453a
+  suno-42:
+    chassis:
+      serial: 93JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.42
+        mac: 00:26:b9:3f:41:23
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4121
+  suno-43:
+    chassis:
+      serial: 23JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.43
+        mac: 00:26:b9:3f:3e:97
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:3e95
+  suno-45:
+    chassis:
+      serial: 25JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.45
+        mac: 00:26:b9:3f:47:7d
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4adc
+  suno-7:
+    chassis:
+      serial: 64JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.7
+        mac: 00:26:b9:3f:43:a3
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:43a1
+  suno-8:
+    chassis:
+      serial: C3JPH4J
+    network_adapters:
+      bmc:
+        ip: 172.17.130.8
+        mac: 00:26:b9:3f:4a:3f
+      eth0:
+        ip6: fe80::226:b9ff:fe3f:4a3d