diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 7c386978e0f0fcdcfe870c4e9c3fd9f0f0b692e3..8865122d16d9fa2be40099005cd2d1d3f5da26e3 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -375,6 +375,9 @@ def get_ref_node_properties_internal(cluster_uid, cluster, node_uid, node)
   h['virtual'] = node['supported_job_types']['virtual']
   h['cpuarch'] = node['architecture']['platform_type']
   h['cpucore'] = node['architecture']['nb_cores'] / node['architecture']['nb_procs']
+  h['cpu_count'] = node['architecture']['nb_procs']
+  h['core_count'] = node['architecture']['nb_cores']
+  h['thread_count'] = node['architecture']['nb_threads']
   h['cputype'] = [node['processor']['model'], node['processor']['version']].join(' ')
   h['cpufreq'] = node['processor']['clock_speed'] / 1_000_000_000.0
   h['disktype'] = [node['storage_devices'].first['interface'], node['storage_devices'].first['storage']].join('/')
diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index 725f58223c3e30117404ad502c734d3e9cda9cc7..e60e0b13eac9c590f4ba06b50363750ecedcfd79 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -141,6 +141,15 @@ class OarPropertiesGenerator < WikiGenerator
     # "cpucount" => { #Unused ?
     #   "description" => "The number of CPUs"
     # },
+    "cpu_count" => {
+      "description" => "The number of CPUs (sockets) the node has"
+    },
+    "core_count" => {
+      "description" => "The total number of CPU cores the node has"
+    },
+    "thread_count" => {
+      "description" => "The total number of CPU threads the node has"
+    },
     "eth_count" => {
       "description" => "The number of Ethernet interface the node has"
     },
diff --git a/spec/output/bad_best_effort_property_diff_stdout.txt b/spec/output/bad_best_effort_property_diff_stdout.txt
index 17eada139daf402fdce76b153ee15e891b6e6dd8..94357623b41fbaad94771a5b9dad689b14de5d32 100644
--- a/spec/output/bad_best_effort_property_diff_stdout.txt
+++ b/spec/output/bad_best_effort_property_diff_stdout.txt
@@ -1,6 +1,13 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "besteffort", "YES", "NO"]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
diff --git a/spec/output/bad_best_effort_property_print_stdout.txt b/spec/output/bad_best_effort_property_print_stdout.txt
index 6a22915e36a156ae9af62cdf7808b4ec41d257c4..e71b3fdd8fa69d12ffe5128c6930d488f5a5d7f8 100644
--- a/spec/output/bad_best_effort_property_print_stdout.txt
+++ b/spec/output/bad_best_effort_property_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='NO' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='NO' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/chassis_unset_diff_stdout.txt b/spec/output/chassis_unset_diff_stdout.txt
index ef83776cb0b2715a3f9bc273f6ba4bccd5b54010..f5db510223e4aa116b7abac80cc4bacc2cdc58fa 100644
--- a/spec/output/chassis_unset_diff_stdout.txt
+++ b/spec/output/chassis_unset_diff_stdout.txt
@@ -2,7 +2,13 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
   clustera-1:
     ["~", "chassis", nil, "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "chassis", nil, "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
-Properties that need to be created on the fakesite server: chassis
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count, chassis
diff --git a/spec/output/chassis_unset_print_stdout.txt b/spec/output/chassis_unset_print_stdout.txt
index a841e23f8a57ee52246f1ec10be6955ac4bb2561..219c5981037c0ea672522f90bbdfa26e81ffa80a 100644
--- a/spec/output/chassis_unset_print_stdout.txt
+++ b/spec/output/chassis_unset_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_misconfigured_cores_diff_stdout.txt b/spec/output/configured_misconfigured_cores_diff_stdout.txt
index 087a1a2ba22b78e85369342d28ec3218646c0df5..f4246d999df626426c045f7a6f86ba6bbebfcad1 100644
--- a/spec/output/configured_misconfigured_cores_diff_stdout.txt
+++ b/spec/output/configured_misconfigured_cores_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: switch, chassis, gpu_model, exotic
+Properties that need to be created on the fakesite server: switch, cpu_count, core_count, thread_count, chassis, gpu_model, exotic
diff --git a/spec/output/configured_misconfigured_cores_print_stdout.txt b/spec/output/configured_misconfigured_cores_print_stdout.txt
index d5029a371abf08d9b502719c5ccc2614b0386e26..b933f6dd96c69c71e1113666ae0e328b9fdc24a7 100644
--- a/spec/output/configured_misconfigured_cores_print_stdout.txt
+++ b/spec/output/configured_misconfigured_cores_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_misconfigured_gpu_diff_stdout.txt b/spec/output/configured_misconfigured_gpu_diff_stdout.txt
index 475daed29df6bb50d8adede0e089af2b8b8ec124..ee9b9eee92a6ed8cb667f469df8156549e96916f 100644
--- a/spec/output/configured_misconfigured_gpu_diff_stdout.txt
+++ b/spec/output/configured_misconfigured_gpu_diff_stdout.txt
@@ -3,11 +3,17 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["~", "deploy", "NO", "YES"]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "exotic", "NO"]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "deploy", "NO", "YES"]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "exotic", "NO"]
-Properties that need to be created on the fakesite server: chassis, exotic
+    ["+", "thread_count", 32]
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count, chassis, exotic
 # Error: Resource 9 (host=clustera-1.fakesite.grid5000.fr cpu=2 core=9 cpuset=8 gpu=2 gpudevice=2) has a mismatch for ressource GPU: OAR API gives 2, generator wants 3.
diff --git a/spec/output/configured_misconfigured_gpu_print_stdout.txt b/spec/output/configured_misconfigured_gpu_print_stdout.txt
index 646a3ae82fafe8b6387f2e94c6813d4d0ae8b548..644c501bbd56e18ddad1cf5b56758a8d527e8fa3 100644
--- a/spec/output/configured_misconfigured_gpu_print_stdout.txt
+++ b/spec/output/configured_misconfigured_gpu_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_missing_network_interfaces_diff_stdout.txt b/spec/output/configured_missing_network_interfaces_diff_stdout.txt
index 7d23e87ae84f689e399cf28d25ffdd93e5d0f8ab..cdd1c1236d13cf1beea4158178821502afcadd41 100644
--- a/spec/output/configured_missing_network_interfaces_diff_stdout.txt
+++ b/spec/output/configured_missing_network_interfaces_diff_stdout.txt
@@ -3,3 +3,7 @@ Error (missing property) while processing node clustera-1: Node clustera-1 does
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-2:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
diff --git a/spec/output/configured_missing_network_interfaces_print_stdout.txt b/spec/output/configured_missing_network_interfaces_print_stdout.txt
index 3d9c1fcda71578e8e627a523f0243d6cb71a43fc..c2e7cdc08454ed7378b7d3d4fa9317cd216cf2c9 100644
--- a/spec/output/configured_missing_network_interfaces_print_stdout.txt
+++ b/spec/output/configured_missing_network_interfaces_print_stdout.txt
@@ -58,6 +58,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -131,6 +134,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_with_disk_diff_stdout.txt b/spec/output/configured_with_disk_diff_stdout.txt
index d9fd42b0564e636f22f4f52bacf520380bcd48f5..fdea7f15adde585f05f7d597d8c635a5b0d907a5 100644
--- a/spec/output/configured_with_disk_diff_stdout.txt
+++ b/spec/output/configured_with_disk_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: switch
+Properties that need to be created on the fakesite server: switch, cpu_count, core_count, thread_count
diff --git a/spec/output/configured_with_disk_print_stdout.txt b/spec/output/configured_with_disk_print_stdout.txt
index dece82f8315cb9f234791ce6b9168c345dd13a49..e2cf66959ede5edef4f8c4b8327cc39e7952b4a8 100644
--- a/spec/output/configured_with_disk_print_stdout.txt
+++ b/spec/output/configured_with_disk_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_without_gpu_diff_stdout.txt b/spec/output/configured_without_gpu_diff_stdout.txt
index d680347a7b77d3ff0b565a06c66ea69fe6199557..1ca23e67b122ea542743aeb08cc232132875fcab 100644
--- a/spec/output/configured_without_gpu_diff_stdout.txt
+++ b/spec/output/configured_without_gpu_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: switch, gpu_model
+Properties that need to be created on the fakesite server: switch, cpu_count, core_count, thread_count, gpu_model
diff --git a/spec/output/configured_without_gpu_print_stdout.txt b/spec/output/configured_without_gpu_print_stdout.txt
index d5029a371abf08d9b502719c5ccc2614b0386e26..b933f6dd96c69c71e1113666ae0e328b9fdc24a7 100644
--- a/spec/output/configured_without_gpu_print_stdout.txt
+++ b/spec/output/configured_without_gpu_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_without_gpu_quirk_cluster_diff_stdout.txt b/spec/output/configured_without_gpu_quirk_cluster_diff_stdout.txt
index d680347a7b77d3ff0b565a06c66ea69fe6199557..1ca23e67b122ea542743aeb08cc232132875fcab 100644
--- a/spec/output/configured_without_gpu_quirk_cluster_diff_stdout.txt
+++ b/spec/output/configured_without_gpu_quirk_cluster_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: switch, gpu_model
+Properties that need to be created on the fakesite server: switch, cpu_count, core_count, thread_count, gpu_model
diff --git a/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt b/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt
index d5029a371abf08d9b502719c5ccc2614b0386e26..b933f6dd96c69c71e1113666ae0e328b9fdc24a7 100644
--- a/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt
+++ b/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/dahu_empty_diff_stdout.txt b/spec/output/dahu_empty_diff_stdout.txt
index 6c27d6a0a8c7e0049e2a575e0f260278c6ca6d1f..22689fa34d2023de78b845e1fad43b77269344f4 100644
--- a/spec/output/dahu_empty_diff_stdout.txt
+++ b/spec/output/dahu_empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 17TRSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 17VJSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-3: new node !
@@ -78,6 +84,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 17VKSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -108,6 +116,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-4: new node !
@@ -115,6 +124,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 17VLSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -145,6 +156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-5: new node !
@@ -152,6 +164,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 16XKSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -182,6 +196,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-6: new node !
@@ -189,6 +204,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 16WMSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -219,6 +236,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-7: new node !
@@ -226,6 +244,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 16YLSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -256,6 +276,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
   clustera-8: new node !
@@ -263,6 +284,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge C6420 16XQSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201800]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -293,6 +316,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/dahu_empty_print_stdout.txt b/spec/output/dahu_empty_print_stdout.txt
index 1ee83d3c81a0ac588203cac0cfb2c0082c467239..1d11abf09704f704d7b9adbda89f8cf2fba8c7e0 100644
--- a/spec/output/dahu_empty_print_stdout.txt
+++ b/spec/output/dahu_empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -121,7 +124,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=31 -p cpuset=29
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=32 -p cpuset=31
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17TRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17TRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -162,7 +165,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=63 -p cpuset=29
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=64 -p cpuset=31
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17VJSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17VJSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -203,7 +206,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=95 -p cpuset=29
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=96 -p cpuset=31
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17VKSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17VKSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -244,7 +247,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=127 -p cpuset=29
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=128 -p cpuset=31
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17VLSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 17VLSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -285,7 +288,7 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=159 -p cpuset=29
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=160 -p cpuset=31
 echo; echo 'Setting properties for clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16XKSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16XKSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -326,7 +329,7 @@ oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=191 -p cpuset=29
 oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=192 -p cpuset=31
 echo; echo 'Setting properties for clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16WMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16WMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -367,7 +370,7 @@ oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=223 -p cpuset=29
 oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=224 -p cpuset=31
 echo; echo 'Setting properties for clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16YLSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16YLSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -408,6 +411,6 @@ oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=255 -p cpuset=29
 oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=256 -p cpuset=31
 echo; echo 'Setting properties for clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16XQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.20.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge C6420' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge C6420 16XQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6144 -p memcpu=98304 -p memnode=196608 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201800 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/different_value_wattmeters_diff_stdout.txt b/spec/output/different_value_wattmeters_diff_stdout.txt
index 2fa93cf2a540cf726de78fb08a7ccaf60c61d91b..b1228de905e89d7e0bb1a6d235f157e9a33fe6f2 100644
--- a/spec/output/different_value_wattmeters_diff_stdout.txt
+++ b/spec/output/different_value_wattmeters_diff_stdout.txt
@@ -2,6 +2,13 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
   clustera-1:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "YES"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
diff --git a/spec/output/different_value_wattmeters_print_stdout.txt b/spec/output/different_value_wattmeters_print_stdout.txt
index e1a2842e6667c119536d2ca89add54ef7a432c35..f59e8813bc09850f7873659ab2f82ff4d0671688 100644
--- a/spec/output/different_value_wattmeters_print_stdout.txt
+++ b/spec/output/different_value_wattmeters_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_contiguous-grouped-by-threads_cpusets_diff_stdout.txt b/spec/output/empty_contiguous-grouped-by-threads_cpusets_diff_stdout.txt
index 00ac08ae60b5cc8affcb74cf063fccded3660e96..fb4344ceda5f25e74c213ce45f2a42a0f6225a85 100644
--- a/spec/output/empty_contiguous-grouped-by-threads_cpusets_diff_stdout.txt
+++ b/spec/output/empty_contiguous-grouped-by-threads_cpusets_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "IBM 8335-GTB 21089EA"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 202010]
+    ["+", "core_count", 20]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "ppc64le"]
     ["+", "cpucore", 10]
     ["+", "cpufreq", "4.0"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 160]
     ["+", "virtual", nil]
     ["+", "wattmeter", "NO"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "IBM 8335-GTB 2108A0A"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 202010]
+    ["+", "core_count", 20]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "ppc64le"]
     ["+", "cpucore", 10]
     ["+", "cpufreq", "4.0"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 160]
     ["+", "virtual", nil]
     ["+", "wattmeter", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt b/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt
index 9899b5dd3929f017fc75d9ec6bebed4fee37e7f0..42e683148817e1d7d3fb943fee560db16d9b29a1 100644
--- a/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt
+++ b/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt
@@ -55,6 +55,9 @@ property_exist 'nodemodel' || oarproperty -a nodemodel --varchar
 property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -108,7 +111,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=19 -p cpuset=144 -p gpu=4 -p gpu_model='Tesla P100-SXM2-16GB' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=20 -p cpuset=152 -p gpu=4 -p gpu_model='Tesla P100-SXM2-16GB' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.24.1' -p cluster='clustera' -p nodemodel='IBM PowerNV S822LC (8335-GTB)' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p cpuarch='ppc64le' -p cpucore=10 -p cputype='POWER8NVL 1.0' -p cpufreq='4.0' -p disktype='SATA/HDD' -p chassis='IBM 8335-GTB 21089EA' -p eth_count=1 -p eth_rate=10 -p ib_count=2 -p ib_rate=100 -p ib='EDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6553 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla P100' -p gpu_count=4 -p exotic='YES' -p mic='NO' -p wattmeter='NO' -p cluster_priority=202010 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.24.1' -p cluster='clustera' -p nodemodel='IBM PowerNV S822LC (8335-GTB)' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p cpuarch='ppc64le' -p cpucore=10 -p cpu_count=2 -p core_count=20 -p thread_count=160 -p cputype='POWER8NVL 1.0' -p cpufreq='4.0' -p disktype='SATA/HDD' -p chassis='IBM 8335-GTB 21089EA' -p eth_count=1 -p eth_rate=10 -p ib_count=2 -p ib_rate=100 -p ib='EDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6553 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla P100' -p gpu_count=4 -p exotic='YES' -p mic='NO' -p wattmeter='NO' -p cluster_priority=202010 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -137,6 +140,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=39 -p cpuset=144 -p gpu=8 -p gpu_model='Tesla P100-SXM2-16GB' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=40 -p cpuset=152 -p gpu=8 -p gpu_model='Tesla P100-SXM2-16GB' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.24.2' -p cluster='clustera' -p nodemodel='IBM PowerNV S822LC (8335-GTB)' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p cpuarch='ppc64le' -p cpucore=10 -p cputype='POWER8NVL 1.0' -p cpufreq='4.0' -p disktype='SATA/HDD' -p chassis='IBM 8335-GTB 2108A0A' -p eth_count=1 -p eth_rate=10 -p ib_count=2 -p ib_rate=100 -p ib='EDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6553 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla P100' -p gpu_count=4 -p exotic='YES' -p mic='NO' -p wattmeter='NO' -p cluster_priority=202010 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.24.2' -p cluster='clustera' -p nodemodel='IBM PowerNV S822LC (8335-GTB)' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p cpuarch='ppc64le' -p cpucore=10 -p cpu_count=2 -p core_count=20 -p thread_count=160 -p cputype='POWER8NVL 1.0' -p cpufreq='4.0' -p disktype='SATA/HDD' -p chassis='IBM 8335-GTB 2108A0A' -p eth_count=1 -p eth_rate=10 -p ib_count=2 -p ib_rate=100 -p ib='EDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=6553 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla P100' -p gpu_count=4 -p exotic='YES' -p mic='NO' -p wattmeter='NO' -p cluster_priority=202010 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_contiguous-including-threads_cpusets_diff_stdout.txt b/spec/output/empty_contiguous-including-threads_cpusets_diff_stdout.txt
index 208e0aee2bae6de8d706c19eeff9a31b8746548e..75da25e04f16d74f27b89101ed2deae861038cf1 100644
--- a/spec/output/empty_contiguous-including-threads_cpusets_diff_stdout.txt
+++ b/spec/output/empty_contiguous-including-threads_cpusets_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "GIGABYTE R181-T92-00 GJG5N9812A0001"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "aarch64"]
     ["+", "cpucore", 32]
     ["+", "cpufreq", "2.2"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 256]
     ["+", "virtual", "arm64"]
     ["+", "wattmeter", "NO"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "GIGABYTE R181-T92-00 GJG5N9812A0004"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "aarch64"]
     ["+", "cpucore", 32]
     ["+", "cpufreq", "2.2"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 256]
     ["+", "virtual", "arm64"]
     ["+", "wattmeter", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt b/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt
index a3a8377de294384b7d6470ceec5e83ea2d059751..9f87bed5529f3256bb9cbc6496679ee93b42f640 100644
--- a/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt
+++ b/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -153,7 +156,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=63 -p cpuset=158
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=64 -p cpuset=159
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.54.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='arm64' -p cpuarch='aarch64' -p cpucore=32 -p cputype='ThunderX2 99xx' -p cpufreq='2.2' -p disktype='SAS/SSD' -p chassis='GIGABYTE R181-T92-00 GJG5N9812A0001' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=0 -p production='NO' -p maintenance='YES' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.54.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='arm64' -p cpuarch='aarch64' -p cpucore=32 -p cpu_count=2 -p core_count=64 -p thread_count=256 -p cputype='ThunderX2 99xx' -p cpufreq='2.2' -p disktype='SAS/SSD' -p chassis='GIGABYTE R181-T92-00 GJG5N9812A0001' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=0 -p production='NO' -p maintenance='YES' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -226,6 +229,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=127 -p cpuset=158
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=128 -p cpuset=159
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.54.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='arm64' -p cpuarch='aarch64' -p cpucore=32 -p cputype='ThunderX2 99xx' -p cpufreq='2.2' -p disktype='SAS/SSD' -p chassis='GIGABYTE R181-T92-00 GJG5N9812A0004' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=0 -p production='NO' -p maintenance='YES' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.54.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='arm64' -p cpuarch='aarch64' -p cpucore=32 -p cpu_count=2 -p core_count=64 -p thread_count=256 -p cputype='ThunderX2 99xx' -p cpufreq='2.2' -p disktype='SAS/SSD' -p chassis='GIGABYTE R181-T92-00 GJG5N9812A0004' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=0 -p production='NO' -p maintenance='YES' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_diff_stdout.txt b/spec/output/empty_diff_stdout.txt
index adb7d62d64808c73db78e733e4aa3bcc0c18ea9c..036607c84d0afa827f4aa37519951c9fc853b56c 100644
--- a/spec/output/empty_diff_stdout.txt
+++ b/spec/output/empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/empty_print_stdout.txt b/spec/output/empty_print_stdout.txt
index eb8fa885c50913c5ce4fd50d0a67a3fa7463e412..522db66a4778267b6236de918a7233177b2f72be 100644
--- a/spec/output/empty_print_stdout.txt
+++ b/spec/output/empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_round_robin_diff_stdout.txt b/spec/output/empty_round_robin_diff_stdout.txt
index adb7d62d64808c73db78e733e4aa3bcc0c18ea9c..036607c84d0afa827f4aa37519951c9fc853b56c 100644
--- a/spec/output/empty_round_robin_diff_stdout.txt
+++ b/spec/output/empty_round_robin_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/empty_round_robin_print_stdout.txt b/spec/output/empty_round_robin_print_stdout.txt
index e45a590309593b5b33efd330240f8f9fd97ad04a..646f25383bfbb15ba5c0e561f79fc1c76ebe5ccb 100644
--- a/spec/output/empty_round_robin_print_stdout.txt
+++ b/spec/output/empty_round_robin_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_with_disk_diff_stdout.txt b/spec/output/empty_with_disk_diff_stdout.txt
index adb7d62d64808c73db78e733e4aa3bcc0c18ea9c..036607c84d0afa827f4aa37519951c9fc853b56c 100644
--- a/spec/output/empty_with_disk_diff_stdout.txt
+++ b/spec/output/empty_with_disk_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/empty_with_disk_print_stdout.txt b/spec/output/empty_with_disk_print_stdout.txt
index a25e943a98d94a0c0f84fd9db83d1ba34bb14beb..50fbefa098c57b2a404884909cc56d94af63a793 100644
--- a/spec/output/empty_with_disk_print_stdout.txt
+++ b/spec/output/empty_with_disk_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_without_gpu_diff_stdout.txt b/spec/output/empty_without_gpu_diff_stdout.txt
index adb7d62d64808c73db78e733e4aa3bcc0c18ea9c..036607c84d0afa827f4aa37519951c9fc853b56c 100644
--- a/spec/output/empty_without_gpu_diff_stdout.txt
+++ b/spec/output/empty_without_gpu_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/empty_without_gpu_print_stdout.txt b/spec/output/empty_without_gpu_print_stdout.txt
index a25e943a98d94a0c0f84fd9db83d1ba34bb14beb..50fbefa098c57b2a404884909cc56d94af63a793 100644
--- a/spec/output/empty_without_gpu_print_stdout.txt
+++ b/spec/output/empty_without_gpu_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-all-gpus_diff_stdout.txt b/spec/output/graffiti-all-gpus_diff_stdout.txt
index 924b17c1cf1f53aae8c1f23cf5b17f85b1db0f61..0be7af566453c999f59fd57da5a9388cc1365972 100644
--- a/spec/output/graffiti-all-gpus_diff_stdout.txt
+++ b/spec/output/graffiti-all-gpus_diff_stdout.txt
@@ -1,16 +1,20 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
-  clustera-1: OK
-  clustera-2: OK
-  clustera-3: OK
-  clustera-4: OK
-  clustera-5: OK
-  clustera-6: OK
-  clustera-7: OK
-  clustera-8: OK
-  clustera-9: OK
-  clustera-10: OK
-  clustera-11: OK
-  clustera-12: OK
-  clustera-13: OK
+  clustera-1:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-2: same modifications as above
+  clustera-3: same modifications as above
+  clustera-4: same modifications as above
+  clustera-5: same modifications as above
+  clustera-6: same modifications as above
+  clustera-7: same modifications as above
+  clustera-8: same modifications as above
+  clustera-9: same modifications as above
+  clustera-10: same modifications as above
+  clustera-11: same modifications as above
+  clustera-12: same modifications as above
+  clustera-13: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath.
 Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb.
diff --git a/spec/output/graffiti-all-gpus_print_stdout.txt b/spec/output/graffiti-all-gpus_print_stdout.txt
index 7191d1c86d73d8940a0bb188cee67686b7fd0dd3..2141dcbac8df335c5b92daa51c440f20f00e223d 100644
--- a/spec/output/graffiti-all-gpus_print_stdout.txt
+++ b/spec/output/graffiti-all-gpus_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664'
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,7 +133,7 @@ oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680'
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -155,7 +158,7 @@ oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696'
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -180,7 +183,7 @@ oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712'
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -205,7 +208,7 @@ oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728'
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -230,7 +233,7 @@ oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744'
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -255,7 +258,7 @@ oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760'
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -280,7 +283,7 @@ oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776'
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -305,7 +308,7 @@ oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792'
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -330,7 +333,7 @@ oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -355,7 +358,7 @@ oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -380,7 +383,7 @@ oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -405,6 +408,6 @@ oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt
index 924b17c1cf1f53aae8c1f23cf5b17f85b1db0f61..0be7af566453c999f59fd57da5a9388cc1365972 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt
@@ -1,16 +1,20 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
-  clustera-1: OK
-  clustera-2: OK
-  clustera-3: OK
-  clustera-4: OK
-  clustera-5: OK
-  clustera-6: OK
-  clustera-7: OK
-  clustera-8: OK
-  clustera-9: OK
-  clustera-10: OK
-  clustera-11: OK
-  clustera-12: OK
-  clustera-13: OK
+  clustera-1:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-2: same modifications as above
+  clustera-3: same modifications as above
+  clustera-4: same modifications as above
+  clustera-5: same modifications as above
+  clustera-6: same modifications as above
+  clustera-7: same modifications as above
+  clustera-8: same modifications as above
+  clustera-9: same modifications as above
+  clustera-10: same modifications as above
+  clustera-11: same modifications as above
+  clustera-12: same modifications as above
+  clustera-13: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath.
 Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb.
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt
index 7191d1c86d73d8940a0bb188cee67686b7fd0dd3..2141dcbac8df335c5b92daa51c440f20f00e223d 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664'
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,7 +133,7 @@ oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680'
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -155,7 +158,7 @@ oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696'
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -180,7 +183,7 @@ oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712'
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -205,7 +208,7 @@ oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728'
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -230,7 +233,7 @@ oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744'
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -255,7 +258,7 @@ oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760'
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -280,7 +283,7 @@ oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776'
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -305,7 +308,7 @@ oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792'
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -330,7 +333,7 @@ oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -355,7 +358,7 @@ oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -380,7 +383,7 @@ oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -405,6 +408,6 @@ oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt
index 871c7ae63634a032f5b4810d6a70e6c791ee2739..6b130f0a93d3ae71c1655a5ac3c34dc6f37d32b9 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt
@@ -1,19 +1,29 @@
 GPU has an unexpected number of resources (current:51 vs expected:52).
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
-  clustera-1: OK
+  clustera-1:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "gpu_count", 3, 4]
-  clustera-3: OK
-  clustera-4: OK
-  clustera-5: OK
-  clustera-6: OK
-  clustera-7: OK
-  clustera-8: OK
-  clustera-9: OK
-  clustera-10: OK
-  clustera-11: OK
-  clustera-12: OK
-  clustera-13: OK
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-3:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-4: same modifications as above
+  clustera-5: same modifications as above
+  clustera-6: same modifications as above
+  clustera-7: same modifications as above
+  clustera-8: same modifications as above
+  clustera-9: same modifications as above
+  clustera-10: same modifications as above
+  clustera-11: same modifications as above
+  clustera-12: same modifications as above
+  clustera-13: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath.
 Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb.
 # Error: Resource 9679 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8555 cpuset=9 gpu=59 gpudevice=2) has a mismatch for ressource GPU: OAR API gives 59, generator wants 60.
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt
index 4f4ac7cffc1fc28cc7b42bfa8453c4e46aa86772..b72519420a0cc3a6dfa10264a04eef5e6253d040 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt
@@ -57,6 +57,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -106,7 +109,7 @@ oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664'
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -131,7 +134,7 @@ oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680'
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -156,7 +159,7 @@ oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696'
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -181,7 +184,7 @@ oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712'
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -206,7 +209,7 @@ oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728'
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -231,7 +234,7 @@ oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744'
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -256,7 +259,7 @@ oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760'
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -281,7 +284,7 @@ oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776'
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -306,7 +309,7 @@ oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792'
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -331,7 +334,7 @@ oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -356,7 +359,7 @@ oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -381,7 +384,7 @@ oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -406,6 +409,6 @@ oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt
index 924b17c1cf1f53aae8c1f23cf5b17f85b1db0f61..0be7af566453c999f59fd57da5a9388cc1365972 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt
@@ -1,16 +1,20 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
-  clustera-1: OK
-  clustera-2: OK
-  clustera-3: OK
-  clustera-4: OK
-  clustera-5: OK
-  clustera-6: OK
-  clustera-7: OK
-  clustera-8: OK
-  clustera-9: OK
-  clustera-10: OK
-  clustera-11: OK
-  clustera-12: OK
-  clustera-13: OK
+  clustera-1:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-2: same modifications as above
+  clustera-3: same modifications as above
+  clustera-4: same modifications as above
+  clustera-5: same modifications as above
+  clustera-6: same modifications as above
+  clustera-7: same modifications as above
+  clustera-8: same modifications as above
+  clustera-9: same modifications as above
+  clustera-10: same modifications as above
+  clustera-11: same modifications as above
+  clustera-12: same modifications as above
+  clustera-13: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath.
 Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb.
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt
index 68bb848fb7ffc5f97e1d943e34b56d7e542943b7..46f194e422c5b820eed5598506fd08debed5fc81 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664'
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,7 +133,7 @@ oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680'
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=3 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=3 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -155,7 +158,7 @@ oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696'
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -180,7 +183,7 @@ oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712'
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -205,7 +208,7 @@ oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728'
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -230,7 +233,7 @@ oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744'
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -255,7 +258,7 @@ oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760'
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -280,7 +283,7 @@ oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776'
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -305,7 +308,7 @@ oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792'
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -330,7 +333,7 @@ oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -355,7 +358,7 @@ oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -380,7 +383,7 @@ oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -405,6 +408,6 @@ oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed_diff_stdout.txt b/spec/output/graffiti-gpu-removed_diff_stdout.txt
index 2472b458241455d855821489a156af3b8d275342..c9dec7b65c5818d94e2d399aa58c92352f29ad45 100644
--- a/spec/output/graffiti-gpu-removed_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed_diff_stdout.txt
@@ -1,19 +1,29 @@
 GPU has an unexpected number of resources (current:52 vs expected:51).
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
-  clustera-1: OK
+  clustera-1:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "gpu_count", 4, 3]
-  clustera-3: OK
-  clustera-4: OK
-  clustera-5: OK
-  clustera-6: OK
-  clustera-7: OK
-  clustera-8: OK
-  clustera-9: OK
-  clustera-10: OK
-  clustera-11: OK
-  clustera-12: OK
-  clustera-13: OK
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-3:
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
+  clustera-4: same modifications as above
+  clustera-5: same modifications as above
+  clustera-6: same modifications as above
+  clustera-7: same modifications as above
+  clustera-8: same modifications as above
+  clustera-9: same modifications as above
+  clustera-10: same modifications as above
+  clustera-11: same modifications as above
+  clustera-12: same modifications as above
+  clustera-13: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath.
 Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb.
 # Error: Resource 9679 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8555 cpuset=9 gpu=60 gpudevice=3) has a mismatch for ressource GPU: OAR API gives 60, generator wants 59.
diff --git a/spec/output/graffiti-gpu-removed_print_stdout.txt b/spec/output/graffiti-gpu-removed_print_stdout.txt
index 4aee4368a12f4c9d8f528f7eaa495bb2b571ac6f..2f61871b243d2ab27f4dfb8d845c446b11f1ba5d 100644
--- a/spec/output/graffiti-gpu-removed_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed_print_stdout.txt
@@ -57,6 +57,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -106,7 +109,7 @@ oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664'
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -131,7 +134,7 @@ oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680'
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=3 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=3 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -156,7 +159,7 @@ oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696'
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -181,7 +184,7 @@ oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712'
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -206,7 +209,7 @@ oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728'
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -231,7 +234,7 @@ oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744'
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -256,7 +259,7 @@ oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760'
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -281,7 +284,7 @@ oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776'
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -306,7 +309,7 @@ oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792'
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -331,7 +334,7 @@ oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -356,7 +359,7 @@ oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -381,7 +384,7 @@ oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -406,6 +409,6 @@ oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti_empty_diff_stdout.txt b/spec/output/graffiti_empty_diff_stdout.txt
index 31fe24c40d40d72c1ff61e5e4f7e29f1d06e8e45..edc806226d11503c2a268bc4513f4ebd8ba97418 100644
--- a/spec/output/graffiti_empty_diff_stdout.txt
+++ b/spec/output/graffiti_empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-3: new node !
@@ -78,6 +84,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 BL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -108,6 +116,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-4: new node !
@@ -115,6 +124,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 DL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -145,6 +156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-5: new node !
@@ -152,6 +164,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 CL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -182,6 +196,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-6: new node !
@@ -189,6 +204,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 8K1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -219,6 +236,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-7: new node !
@@ -226,6 +244,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 BK1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -256,6 +276,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-8: new node !
@@ -263,6 +284,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 CK1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -293,6 +316,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-9: new node !
@@ -300,6 +324,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9K1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -330,6 +356,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-10: new node !
@@ -337,6 +364,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 GL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -367,6 +396,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-11: new node !
@@ -374,6 +404,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 JL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -404,6 +436,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-12: new node !
@@ -411,6 +444,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 HL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -441,6 +476,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-13: new node !
@@ -448,6 +484,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 7K1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -478,6 +516,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/graffiti_empty_print_stdout.txt b/spec/output/graffiti_empty_print_stdout.txt
index 16b4db3e4044380e72a22c7d475be7d822d35955..11482f5c7e9341e98bb1d6a61f28ff6291556f5d 100644
--- a/spec/output/graffiti_empty_print_stdout.txt
+++ b/spec/output/graffiti_empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,7 +133,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -155,7 +158,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -180,7 +183,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -205,7 +208,7 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=79 -p cpuset=13 -p gpu=20 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=80 -p cpuset=15 -p gpu=20 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -230,7 +233,7 @@ oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=95 -p cpuset=13 -p gpu=24 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=96 -p cpuset=15 -p gpu=24 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -255,7 +258,7 @@ oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=111 -p cpuset=13 -p gpu=28 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=112 -p cpuset=15 -p gpu=28 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -280,7 +283,7 @@ oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=127 -p cpuset=13 -p gpu=32 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=128 -p cpuset=15 -p gpu=32 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -305,7 +308,7 @@ oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=143 -p cpuset=13 -p gpu=36 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=144 -p cpuset=15 -p gpu=36 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -330,7 +333,7 @@ oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clust
 oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=159 -p cpuset=13 -p gpu=40 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=160 -p cpuset=15 -p gpu=40 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -355,7 +358,7 @@ oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clust
 oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=175 -p cpuset=13 -p gpu=44 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=176 -p cpuset=15 -p gpu=44 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -380,7 +383,7 @@ oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clust
 oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=191 -p cpuset=13 -p gpu=48 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=192 -p cpuset=15 -p gpu=48 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -405,6 +408,6 @@ oarnodesetting -a -h 'clustera-13.fakesite.grid5000.fr' -s Absent -p host='clust
 oarnodesetting -a -h 'clustera-13.fakesite.grid5000.fr' -s Absent -p host='clustera-13.fakesite.grid5000.fr' -p cpu=26 -p core=207 -p cpuset=13 -p gpu=52 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-13.fakesite.grid5000.fr' -s Absent -p host='clustera-13.fakesite.grid5000.fr' -p cpu=26 -p core=208 -p cpuset=15 -p gpu=52 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graphite_empty_diff_stdout.txt b/spec/output/graphite_empty_diff_stdout.txt
index 5381e9b2b456f1b99ddbabca54e6e1be82b87d61..d437ca5c27765c8034201d615e2d1e475ec166bf 100644
--- a/spec/output/graphite_empty_diff_stdout.txt
+++ b/spec/output/graphite_empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R720 27Q7NZ1"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201312]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.0"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R720 B6Q7NZ1"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201312]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.0"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-3: new node !
@@ -78,6 +84,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R720 G5Q7NZ1"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201312]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.0"]
@@ -108,6 +116,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-4: new node !
@@ -115,6 +124,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R720 66Q7NZ1"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201312]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.0"]
@@ -145,6 +156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/graphite_empty_print_stdout.txt b/spec/output/graphite_empty_print_stdout.txt
index 7758cb46f7a5f2ca9cb3e3af6ce59967db347986..40fa553d171259bdefffc28c4188c13e3efc987d 100644
--- a/spec/output/graphite_empty_print_stdout.txt
+++ b/spec/output/graphite_empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 27Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 27Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,7 +133,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 B6Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 B6Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -155,7 +158,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 G5Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 G5Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -180,6 +183,6 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 66Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.68.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R720' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II/SSD' -p chassis='Dell Inc. PowerEdge R720 66Q7NZ1' -p eth_count=1 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=16384 -p memcpu=131072 -p memnode=262144 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='YES' -p wattmeter='MULTIPLE' -p cluster_priority=201312 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/grimoire_empty_diff_stdout.txt b/spec/output/grimoire_empty_diff_stdout.txt
index 55c4f9241df4fffdf27742e10e6b929d3f0ecbdf..fd2a634cb66f69e0e9598395809ddc1aad0983d6 100644
--- a/spec/output/grimoire_empty_diff_stdout.txt
+++ b/spec/output/grimoire_empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-3: new node !
@@ -78,6 +84,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -108,6 +116,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-4: new node !
@@ -115,6 +124,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -145,6 +156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-5: new node !
@@ -152,6 +164,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -182,6 +196,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-6: new node !
@@ -189,6 +204,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -219,6 +236,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-7: new node !
@@ -226,6 +244,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -256,6 +276,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-8: new node !
@@ -263,6 +284,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -293,6 +316,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdb.clustera-1"]: new disk !
@@ -301,6 +325,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -336,6 +362,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdc.clustera-1"]: new disk !
@@ -344,6 +371,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -379,6 +408,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdd.clustera-1"]: new disk !
@@ -387,6 +417,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -422,6 +454,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sde.clustera-1"]: new disk !
@@ -430,6 +463,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -465,6 +500,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdf.clustera-1"]: new disk !
@@ -473,6 +509,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -508,6 +546,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdb.clustera-2"]: new disk !
@@ -516,6 +555,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -551,6 +592,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdc.clustera-2"]: new disk !
@@ -559,6 +601,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -594,6 +638,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdd.clustera-2"]: new disk !
@@ -602,6 +647,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -637,6 +684,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sde.clustera-2"]: new disk !
@@ -645,6 +693,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -680,6 +730,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdf.clustera-2"]: new disk !
@@ -688,6 +739,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -723,6 +776,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdb.clustera-3"]: new disk !
@@ -731,6 +785,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -766,6 +822,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdc.clustera-3"]: new disk !
@@ -774,6 +831,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -809,6 +868,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdd.clustera-3"]: new disk !
@@ -817,6 +877,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -852,6 +914,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sde.clustera-3"]: new disk !
@@ -860,6 +923,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -895,6 +960,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdf.clustera-3"]: new disk !
@@ -903,6 +969,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -938,6 +1006,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdb.clustera-4"]: new disk !
@@ -946,6 +1015,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -981,6 +1052,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdc.clustera-4"]: new disk !
@@ -989,6 +1061,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1024,6 +1098,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdd.clustera-4"]: new disk !
@@ -1032,6 +1107,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1067,6 +1144,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sde.clustera-4"]: new disk !
@@ -1075,6 +1153,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1110,6 +1190,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdf.clustera-4"]: new disk !
@@ -1118,6 +1199,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1153,6 +1236,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-5", "sdb.clustera-5"]: new disk !
@@ -1161,6 +1245,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1196,6 +1282,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-5", "sdc.clustera-5"]: new disk !
@@ -1204,6 +1291,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1239,6 +1328,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-5", "sdd.clustera-5"]: new disk !
@@ -1247,6 +1337,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1282,6 +1374,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-5", "sde.clustera-5"]: new disk !
@@ -1290,6 +1383,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1325,6 +1420,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-5", "sdf.clustera-5"]: new disk !
@@ -1333,6 +1429,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1368,6 +1466,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-6", "sdb.clustera-6"]: new disk !
@@ -1376,6 +1475,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1411,6 +1512,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-6", "sdc.clustera-6"]: new disk !
@@ -1419,6 +1521,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1454,6 +1558,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-6", "sdd.clustera-6"]: new disk !
@@ -1462,6 +1567,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1497,6 +1604,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-6", "sde.clustera-6"]: new disk !
@@ -1505,6 +1613,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1540,6 +1650,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-6", "sdf.clustera-6"]: new disk !
@@ -1548,6 +1659,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1583,6 +1696,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-7", "sdb.clustera-7"]: new disk !
@@ -1591,6 +1705,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1626,6 +1742,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-7", "sdc.clustera-7"]: new disk !
@@ -1634,6 +1751,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1669,6 +1788,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-7", "sdd.clustera-7"]: new disk !
@@ -1677,6 +1797,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1712,6 +1834,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-7", "sde.clustera-7"]: new disk !
@@ -1720,6 +1843,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1755,6 +1880,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-7", "sdf.clustera-7"]: new disk !
@@ -1763,6 +1889,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1798,6 +1926,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-8", "sdb.clustera-8"]: new disk !
@@ -1806,6 +1935,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1841,6 +1972,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-8", "sdc.clustera-8"]: new disk !
@@ -1849,6 +1981,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1884,6 +2018,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-8", "sdd.clustera-8"]: new disk !
@@ -1892,6 +2027,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1927,6 +2064,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-8", "sde.clustera-8"]: new disk !
@@ -1935,6 +2073,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -1970,6 +2110,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-8", "sdf.clustera-8"]: new disk !
@@ -1978,6 +2119,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201601]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.4"]
@@ -2013,6 +2156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/grimoire_empty_print_stdout.txt b/spec/output/grimoire_empty_print_stdout.txt
index 3021de2356914d0bfaa58e77fbea8c987f1f9c0a..73b8a8e6d81ccc626cb6cea324f64cdc90aae7d5 100644
--- a/spec/output/grimoire_empty_print_stdout.txt
+++ b/spec/output/grimoire_empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -115,7 +118,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-1'
 
 echo; echo 'Setting properties for disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -123,7 +126,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-1'
 
 echo; echo 'Setting properties for disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -131,7 +134,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-1'
 
 echo; echo 'Setting properties for disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -139,7 +142,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sde.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sde.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-1'
 
 echo; echo 'Setting properties for disk sde.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -147,7 +150,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdf.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdf.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-1'
 
 echo; echo 'Setting properties for disk sdf.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z13J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -172,7 +175,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -180,7 +183,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-2'
 
 echo; echo 'Setting properties for disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -188,7 +191,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-2'
 
 echo; echo 'Setting properties for disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -196,7 +199,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-2'
 
 echo; echo 'Setting properties for disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -204,7 +207,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sde.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sde.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-2'
 
 echo; echo 'Setting properties for disk sde.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -212,7 +215,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdf.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdf.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-2'
 
 echo; echo 'Setting properties for disk sdf.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3Z0ZH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -237,7 +240,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -245,7 +248,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-3'
 
 echo; echo 'Setting properties for disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -253,7 +256,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-3'
 
 echo; echo 'Setting properties for disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -261,7 +264,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-3'
 
 echo; echo 'Setting properties for disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -269,7 +272,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sde.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sde.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-3'
 
 echo; echo 'Setting properties for disk sde.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -277,7 +280,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdf.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdf.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-3'
 
 echo; echo 'Setting properties for disk sdf.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3YZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -302,7 +305,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -310,7 +313,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-4'
 
 echo; echo 'Setting properties for disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -318,7 +321,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-4'
 
 echo; echo 'Setting properties for disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -326,7 +329,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-4'
 
 echo; echo 'Setting properties for disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -334,7 +337,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sde.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sde.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-4'
 
 echo; echo 'Setting properties for disk sde.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -342,7 +345,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdf.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdf.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-4'
 
 echo; echo 'Setting properties for disk sdf.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36ZYH82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -367,7 +370,7 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=79 -p cpuset=13
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=80 -p cpuset=15
 echo; echo 'Setting properties for clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -375,7 +378,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdb.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdb.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-5'
 
 echo; echo 'Setting properties for disk sdb.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -383,7 +386,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdc.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdc.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-5'
 
 echo; echo 'Setting properties for disk sdc.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -391,7 +394,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdd.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdd.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-5'
 
 echo; echo 'Setting properties for disk sdd.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -399,7 +402,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sde.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sde.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-5'
 
 echo; echo 'Setting properties for disk sde.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -407,7 +410,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdf.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdf.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-5'
 
 echo; echo 'Setting properties for disk sdf.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36X1J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -432,7 +435,7 @@ oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=95 -p cpuset=13
 oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=96 -p cpuset=15
 echo; echo 'Setting properties for clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -440,7 +443,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdb.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdb.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-6'
 
 echo; echo 'Setting properties for disk sdb.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -448,7 +451,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdc.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdc.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-6'
 
 echo; echo 'Setting properties for disk sdc.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -456,7 +459,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdd.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdd.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-6'
 
 echo; echo 'Setting properties for disk sdd.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -464,7 +467,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sde.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sde.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-6'
 
 echo; echo 'Setting properties for disk sde.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -472,7 +475,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdf.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdf.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-6'
 
 echo; echo 'Setting properties for disk sdf.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3722J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -497,7 +500,7 @@ oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=111 -p cpuset=13
 oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=112 -p cpuset=15
 echo; echo 'Setting properties for clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -505,7 +508,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdb.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdb.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-7'
 
 echo; echo 'Setting properties for disk sdb.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -513,7 +516,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdc.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdc.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-7'
 
 echo; echo 'Setting properties for disk sdc.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -521,7 +524,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdd.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdd.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-7'
 
 echo; echo 'Setting properties for disk sdd.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -529,7 +532,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sde.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sde.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-7'
 
 echo; echo 'Setting properties for disk sde.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -537,7 +540,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdf.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdf.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-7'
 
 echo; echo 'Setting properties for disk sdf.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 36Y3J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -562,7 +565,7 @@ oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=127 -p cpuset=13
 oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=128 -p cpuset=15
 echo; echo 'Setting properties for clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -570,7 +573,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdb.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdb.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-8'
 
 echo; echo 'Setting properties for disk sdb.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -578,7 +581,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdc.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdc.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-8'
 
 echo; echo 'Setting properties for disk sdc.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -586,7 +589,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdd.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdd.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-8'
 
 echo; echo 'Setting properties for disk sdd.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -594,7 +597,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sde.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sde.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-8'
 
 echo; echo 'Setting properties for disk sde.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -602,6 +605,6 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdf.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdf.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-8'
 
 echo; echo 'Setting properties for disk sdf.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon E5-2630 v3' -p cpufreq='2.4' -p disktype='SCSI/HDD' -p chassis='Dell Inc. PowerEdge R630 3703J82' -p eth_count=4 -p eth_rate=10 -p ib_count=1 -p ib_rate=56 -p ib='FDR' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
diff --git a/spec/output/grue_empty_diff_stdout.txt b/spec/output/grue_empty_diff_stdout.txt
index c06261b617c0ae81f3bb6d70f4516d39aeecc67e..b82dff46a4884ea498d46ec97d6c5bbcba49910c 100644
--- a/spec/output/grue_empty_diff_stdout.txt
+++ b/spec/output/grue_empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R7425 FVJVY03"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201911]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.4"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "amd-v"]
     ["+", "wattmeter", "NO"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R7425 DVJVY03"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201911]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.4"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "amd-v"]
     ["+", "wattmeter", "NO"]
   clustera-3: new node !
@@ -78,6 +84,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R7425 CVJVY03"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201911]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.4"]
@@ -108,6 +116,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "amd-v"]
     ["+", "wattmeter", "NO"]
   clustera-4: new node !
@@ -115,6 +124,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R7425 GVJVY03"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201911]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.4"]
@@ -145,6 +156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "amd-v"]
     ["+", "wattmeter", "NO"]
   clustera-5: new node !
@@ -152,6 +164,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R7425 BVJVY03"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201911]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.4"]
@@ -182,6 +196,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 64]
     ["+", "virtual", "amd-v"]
     ["+", "wattmeter", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/grue_empty_print_stdout.txt b/spec/output/grue_empty_print_stdout.txt
index 522b6d4c42957e6b2dcf3c9491e1ed04a1ddd400..2b3b695920599badf6e6f29d6074102266895944 100644
--- a/spec/output/grue_empty_print_stdout.txt
+++ b/spec/output/grue_empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -121,7 +124,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=31 -p cpuset=29 -p gpu=4 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=32 -p cpuset=31 -p gpu=3 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 FVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 FVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -162,7 +165,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=63 -p cpuset=29 -p gpu=8 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=64 -p cpuset=31 -p gpu=7 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 DVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 DVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -203,7 +206,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=95 -p cpuset=29 -p gpu=12 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=96 -p cpuset=31 -p gpu=11 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 CVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 CVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -244,7 +247,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=127 -p cpuset=29 -p gpu=16 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=128 -p cpuset=31 -p gpu=15 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 GVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 GVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -285,6 +288,6 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=159 -p cpuset=29 -p gpu=20 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=160 -p cpuset=31 -p gpu=19 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 BVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.77.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 BVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/grue_nogpus_diff_stdout.txt b/spec/output/grue_nogpus_diff_stdout.txt
index 38917ad89bd93f9e8a134cb0e708b391bea5de27..523521ce0bcf1ff586463c835bf7d2b707600f8c 100644
--- a/spec/output/grue_nogpus_diff_stdout.txt
+++ b/spec/output/grue_nogpus_diff_stdout.txt
@@ -3,10 +3,14 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["~", "disktype", "SAS", "SAS/SSD"]
     ["~", "gpu_count", nil, 4]
     ["~", "gpu_model", nil, "Tesla T4"]
+    ["+", "core_count", 32]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 64]
   clustera-2: same modifications as above
   clustera-3: same modifications as above
   clustera-4: same modifications as above
   clustera-5: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath.
 Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb.
 # Error: Resource 12215 (host=clustera-1.nancy.grid5000.fr cpu=1765 core=10967 cpuset=0 gpu= gpudevice=) has a mismatch for ressource GPU: OAR API gives , generator wants 105.
diff --git a/spec/output/grue_nogpus_print_stdout.txt b/spec/output/grue_nogpus_print_stdout.txt
index bac2b54d03685bf49c2029c25fe25d6d108d0cb1..8ebb9bb1e109208ea28701b759e8afe088759f83 100644
--- a/spec/output/grue_nogpus_print_stdout.txt
+++ b/spec/output/grue_nogpus_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -121,7 +124,7 @@ oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='12244
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='12245' AND type='default'" -p cpu=1766 -p core=10997 -p cpuset=29 -p gpu=108 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='12246' AND type='default'" -p cpu=1766 -p core=10998 -p cpuset=31 -p gpu=107 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 FVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 FVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -162,7 +165,7 @@ oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='12276
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='12277' AND type='default'" -p cpu=1768 -p core=11029 -p cpuset=29 -p gpu=112 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='12278' AND type='default'" -p cpu=1768 -p core=11030 -p cpuset=31 -p gpu=111 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 DVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 DVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -203,7 +206,7 @@ oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='12308
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='12309' AND type='default'" -p cpu=1770 -p core=11061 -p cpuset=29 -p gpu=116 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='12310' AND type='default'" -p cpu=1770 -p core=11062 -p cpuset=31 -p gpu=115 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 CVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 CVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -244,7 +247,7 @@ oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='12340
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='12341' AND type='default'" -p cpu=1772 -p core=11093 -p cpuset=29 -p gpu=120 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='12342' AND type='default'" -p cpu=1772 -p core=11094 -p cpuset=31 -p gpu=119 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 GVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 GVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -285,6 +288,6 @@ oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='12372
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='12373' AND type='default'" -p cpu=1774 -p core=11125 -p cpuset=29 -p gpu=124 -p gpu_model='Tesla T4' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='12374' AND type='default'" -p cpu=1774 -p core=11126 -p cpuset=31 -p gpu=123 -p gpu_model='Tesla T4' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 BVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.77.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R7425' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='amd-v' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=2 -p core_count=32 -p thread_count=64 -p cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R7425 BVJVY03' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=4096 -p memcpu=65536 -p memnode=131072 -p gpu_model='Tesla T4' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201911 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/missing_property_diff_stdout.txt b/spec/output/missing_property_diff_stdout.txt
index 5c6e50b9d867fc7761b7ac7756c080bcf6197d7e..34a3314acfa0b9287044694f23060c8b48e290bd 100644
--- a/spec/output/missing_property_diff_stdout.txt
+++ b/spec/output/missing_property_diff_stdout.txt
@@ -1,6 +1,9 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "ib_rate", 0]
+    ["+", "thread_count", 32]
   clustera-2: same modifications as above
-Properties that need to be created on the fakesite server: ib_rate
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count, ib_rate
diff --git a/spec/output/missing_property_print_stdout.txt b/spec/output/missing_property_print_stdout.txt
index a841e23f8a57ee52246f1ec10be6955ac4bb2561..219c5981037c0ea672522f90bbdfa26e81ffa80a 100644
--- a/spec/output/missing_property_print_stdout.txt
+++ b/spec/output/missing_property_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/non_reservable_gpus_diff_stdout.txt b/spec/output/non_reservable_gpus_diff_stdout.txt
index 8b4deea27ec63bfae0633251db4fdd42a60a8e85..52658958c8d4aa0256c86f4c2ced7f06915a7b21 100644
--- a/spec/output/non_reservable_gpus_diff_stdout.txt
+++ b/spec/output/non_reservable_gpus_diff_stdout.txt
@@ -1,7 +1,11 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
 # Error: Resource 1 (host=clustera-1.fakesite.grid5000.fr cpu=1 core=1 cpuset=0 gpu=1 gpudevice=0) has a mismatch for ressource GPU: OAR API gives 1, generator wants null.
 # Error: Resource 1 (host=clustera-1.fakesite.grid5000.fr cpu=1 core=1 cpuset=0 gpu=1 gpudevice=0) has a mismatch for ressource GPUDEVICE: OAR API gives 0, generator wants null.
 # Error: Resource 2 (host=clustera-1.fakesite.grid5000.fr cpu=1 core=2 cpuset=1 gpu=1 gpudevice=0) has a mismatch for ressource GPU: OAR API gives 1, generator wants null.
diff --git a/spec/output/non_reservable_gpus_print_stdout.txt b/spec/output/non_reservable_gpus_print_stdout.txt
index f4c835540e03860982a9f589266f87120127756c..43be2f51bcf1232b3442d4d521ec426b54792962 100644
--- a/spec/output/non_reservable_gpus_print_stdout.txt
+++ b/spec/output/non_reservable_gpus_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/wattmeters_nil_diff_stdout.txt b/spec/output/wattmeters_nil_diff_stdout.txt
index b94304b29d4389a8050d408393be32e5a938fc06..076ae1f38c536fcfa2f92a23863bb71e6e8db068 100644
--- a/spec/output/wattmeters_nil_diff_stdout.txt
+++ b/spec/output/wattmeters_nil_diff_stdout.txt
@@ -2,4 +2,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
   clustera-1:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
diff --git a/spec/output/wattmeters_nil_print_stdout.txt b/spec/output/wattmeters_nil_print_stdout.txt
index d237c3bd9f16e1a84f5c048655341ba8f8a2b57c..962dee76d55248ea26d89c7d3ff44c35c39dad97 100644
--- a/spec/output/wattmeters_nil_print_stdout.txt
+++ b/spec/output/wattmeters_nil_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/with-data_diff_stdout.txt b/spec/output/with-data_diff_stdout.txt
index dfb850e864bfd7203894a0815092b397e57dc145..7ec5971b3eb09bd6eec8c1ba0ae458a58e144691 100644
--- a/spec/output/with-data_diff_stdout.txt
+++ b/spec/output/with-data_diff_stdout.txt
@@ -1,4 +1,8 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
+    ["+", "thread_count", 32]
   clustera-2: same modifications as above
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count
diff --git a/spec/output/with-data_print_stdout.txt b/spec/output/with-data_print_stdout.txt
index a841e23f8a57ee52246f1ec10be6955ac4bb2561..219c5981037c0ea672522f90bbdfa26e81ffa80a 100644
--- a/spec/output/with-data_print_stdout.txt
+++ b/spec/output/with-data_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt b/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt
index ef36b7471722e0ccad364620ddaa58c587542f89..c45c75b2d6f035aaa84469a016fcc153ff297b73 100644
--- a/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt
+++ b/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201906]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 8]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 0]
     ["+", "production", "YES"]
     ["+", "switch", "gw-fakesite"]
+    ["+", "thread_count", 32]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "MULTIPLE"]
-Properties that need to be created on the fakesite server: switch, chassis
+Properties that need to be created on the fakesite server: switch, cpu_count, core_count, thread_count, chassis
diff --git a/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt b/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt
index dece82f8315cb9f234791ce6b9168c345dd13a49..e2cf66959ede5edef4f8c4b8327cc39e7952b4a8 100644
--- a/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt
+++ b/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -107,7 +110,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -132,6 +135,6 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/wrong_variable_type_diff_stdout.txt b/spec/output/wrong_variable_type_diff_stdout.txt
index df4c0e52c8da3022be09f73e792ffd3f1210e5f7..602e37e76610ca50a77b637646f6759fbb86e4f3 100644
--- a/spec/output/wrong_variable_type_diff_stdout.txt
+++ b/spec/output/wrong_variable_type_diff_stdout.txt
@@ -3,11 +3,17 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["~", "eth_rate", "10", 10]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "exotic", "NO"]
+    ["+", "thread_count", 32]
   clustera-2:
     ["~", "eth_rate", "10", 10]
     ["~", "gpu_model", "GeForce RTX 2080 Ti", "RTX 2080 Ti"]
     ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
+    ["+", "core_count", 16]
+    ["+", "cpu_count", 2]
     ["+", "exotic", "NO"]
+    ["+", "thread_count", 32]
 Error: the OAR property 'eth_rate' is a 'String' on the fakesite server and this script uses 'Integer' for this property.
-Properties that need to be created on the fakesite server: chassis, exotic
+Properties that need to be created on the fakesite server: cpu_count, core_count, thread_count, chassis, exotic
diff --git a/spec/output/wrong_variable_type_print_stdout.txt b/spec/output/wrong_variable_type_print_stdout.txt
index a841e23f8a57ee52246f1ec10be6955ac4bb2561..219c5981037c0ea672522f90bbdfa26e81ffa80a 100644
--- a/spec/output/wrong_variable_type_print_stdout.txt
+++ b/spec/output/wrong_variable_type_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -105,7 +108,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -130,6 +133,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/yeti_empty_diff_stdout.txt b/spec/output/yeti_empty_diff_stdout.txt
index 33135060a946d9244ddd3c5aa5de21b385d0e3eb..fd0c09d409f3ac7caf244c0e5a0119ac1bb46f1f 100644
--- a/spec/output/yeti_empty_diff_stdout.txt
+++ b/spec/output/yeti_empty_diff_stdout.txt
@@ -4,6 +4,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -34,6 +36,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-2: new node !
@@ -41,6 +44,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -71,6 +76,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-3: new node !
@@ -78,6 +84,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -108,6 +116,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   clustera-4: new node !
@@ -115,6 +124,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -145,6 +156,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdb.clustera-1"]: new disk !
@@ -153,6 +165,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -188,6 +202,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdc.clustera-1"]: new disk !
@@ -196,6 +211,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -231,6 +248,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdd.clustera-1"]: new disk !
@@ -239,6 +257,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -274,6 +294,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdb.clustera-2"]: new disk !
@@ -282,6 +303,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -317,6 +340,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdc.clustera-2"]: new disk !
@@ -325,6 +349,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -360,6 +386,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-2", "sdd.clustera-2"]: new disk !
@@ -368,6 +395,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -403,6 +432,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdb.clustera-3"]: new disk !
@@ -411,6 +441,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -446,6 +478,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdc.clustera-3"]: new disk !
@@ -454,6 +487,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -489,6 +524,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-3", "sdd.clustera-3"]: new disk !
@@ -497,6 +533,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -532,6 +570,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdb.clustera-4"]: new disk !
@@ -540,6 +579,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -575,6 +616,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdc.clustera-4"]: new disk !
@@ -583,6 +625,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -618,6 +662,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
   ["clustera-4", "sdd.clustera-4"]: new disk !
@@ -626,6 +671,8 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
     ["+", "cluster_priority", 201801]
+    ["+", "core_count", 64]
+    ["+", "cpu_count", 4]
     ["+", "cpuarch", "x86_64"]
     ["+", "cpucore", 16]
     ["+", "cpufreq", "2.1"]
@@ -661,6 +708,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "opa_rate", 100]
     ["+", "production", "NO"]
     ["+", "switch", "gw"]
+    ["+", "thread_count", 128]
     ["+", "virtual", "ivt"]
     ["+", "wattmeter", "YES"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cpu_count, core_count, thread_count, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_model, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/yeti_empty_print_stdout.txt b/spec/output/yeti_empty_print_stdout.txt
index 0ecc1e37afc4711377b609fb35b8fdbdc649f67a..e68c44bc42ee0415aee3ba7574213fd47490e8e3 100644
--- a/spec/output/yeti_empty_print_stdout.txt
+++ b/spec/output/yeti_empty_print_stdout.txt
@@ -56,6 +56,9 @@ property_exist 'switch' || oarproperty -a switch --varchar
 property_exist 'virtual' || oarproperty -a virtual --varchar
 property_exist 'cpuarch' || oarproperty -a cpuarch --varchar
 property_exist 'cpucore' || oarproperty -a cpucore
+property_exist 'cpu_count' || oarproperty -a cpu_count
+property_exist 'core_count' || oarproperty -a core_count
+property_exist 'thread_count' || oarproperty -a thread_count
 property_exist 'cputype' || oarproperty -a cputype --varchar
 property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
 property_exist 'disktype' || oarproperty -a disktype --varchar
@@ -155,7 +158,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=4 -p core=63 -p cpuset=59
 oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=4 -p core=64 -p cpuset=63
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -163,7 +166,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-1'
 
 echo; echo 'Setting properties for disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -171,7 +174,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-1'
 
 echo; echo 'Setting properties for disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -179,7 +182,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-1'
 
 echo; echo 'Setting properties for disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGQSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -252,7 +255,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=127 -p cpuset=59
 oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=128 -p cpuset=63
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -260,7 +263,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-2'
 
 echo; echo 'Setting properties for disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -268,7 +271,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-2'
 
 echo; echo 'Setting properties for disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -276,7 +279,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-2'
 
 echo; echo 'Setting properties for disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGRSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -349,7 +352,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=12 -p core=191 -p cpuset=59
 oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=12 -p core=192 -p cpuset=63
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -357,7 +360,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-3'
 
 echo; echo 'Setting properties for disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -365,7 +368,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-3'
 
 echo; echo 'Setting properties for disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -373,7 +376,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-3'
 
 echo; echo 'Setting properties for disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGPSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -446,7 +449,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='cluste
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=16 -p core=255 -p cpuset=59
 oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=16 -p core=256 -p cpuset=63
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_model='' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3
 
 echo '================================================================================'
 echo; echo 'Adding disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -454,7 +457,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-4'
 
 echo; echo 'Setting properties for disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -462,7 +465,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-4'
 
 echo; echo 'Setting properties for disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -470,6 +473,6 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-4'
 
 echo; echo 'Setting properties for disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p cpu_count=4 -p core_count=64 -p thread_count=128 -p cputype='Intel Xeon Gold 6130' -p cpufreq='2.1' -p disktype='SAS/SSD' -p chassis='Dell Inc. PowerEdge R940 6FGMSM2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=1 -p opa_rate=100 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=12288 -p memcpu=196608 -p memnode=786432 -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'