diff --git a/spec/output/graffiti_empty_diff_stdout.txt b/spec/output/graffiti_empty_diff_stdout.txt
index bcb289b18641ef529311a115b51659bef0c7f984..717735bf25efdc1e881a5e7affd9455a8b337e76 100644
--- a/spec/output/graffiti_empty_diff_stdout.txt
+++ b/spec/output/graffiti_empty_diff_stdout.txt
@@ -3,6 +3,7 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakes
Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
clustera-1: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -38,6 +39,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-2: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -73,6 +75,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-3: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 BL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -108,6 +111,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-4: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 DL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -143,6 +147,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-5: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 CL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -178,6 +183,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-6: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 8K1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -213,6 +219,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-7: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 BK1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -248,6 +255,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-8: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 CK1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -283,6 +291,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-9: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 9K1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -318,6 +327,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-10: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 GL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -353,6 +363,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-11: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 JL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -388,6 +399,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-12: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 HL1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -423,6 +435,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-13: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge T640 7K1CBX2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201906]
["+", "cpuarch", "x86_64"]
@@ -456,4 +469,4 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "switch", "gw"]
["+", "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, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, 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, 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_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 f58df88e21f0bf7bba36e576c850e00d1f931a71..ce9ce514508959af541a7f6dc622a35f2ebc3b72 100644
--- a/spec/output/graffiti_empty_print_stdout.txt
+++ b/spec/output/graffiti_empty_print_stdout.txt
@@ -59,6 +59,7 @@ property_exist 'cpucore' || oarproperty -a cpucore
property_exist 'cputype' || oarproperty -a cputype --varchar
property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
property_exist 'disktype' || oarproperty -a disktype --varchar
+property_exist 'chassis' || oarproperty -a chassis --varchar
property_exist 'eth_count' || oarproperty -a eth_count
property_exist 'eth_rate' || oarproperty -a eth_rate
property_exist 'ib_count' || oarproperty -a ib_count
@@ -103,7 +104,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakes
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -128,7 +129,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -153,7 +154,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakes
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -178,7 +179,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakes
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -203,7 +204,7 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -p host='clustera-5.fakes
oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -228,7 +229,7 @@ oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -p host='clustera-6.fakes
oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -253,7 +254,7 @@ oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -p host='clustera-7.fakes
oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -278,7 +279,7 @@ oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -p host='clustera-8.fakes
oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -303,7 +304,7 @@ oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -p host='clustera-9.fakes
oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -328,7 +329,7 @@ oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -p host='clustera-10.fak
oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -353,7 +354,7 @@ oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -p host='clustera-11.fak
oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -378,7 +379,7 @@ oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -p host='clustera-12.fak
oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 '================================================================================'
@@ -403,6 +404,6 @@ oarnodesetting -a -h 'clustera-13.fakesite.grid5000.fr' -p host='clustera-13.fak
oarnodesetting -a -h 'clustera-13.fakesite.grid5000.fr' -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' -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' -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_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 cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -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_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 7e779b853a534789efea5a1b87218d1f29b1efc8..640bcfd8340df4fe304e6404f40df76303cd3346 100644
--- a/spec/output/graphite_empty_diff_stdout.txt
+++ b/spec/output/graphite_empty_diff_stdout.txt
@@ -3,6 +3,7 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakes
Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
clustera-1: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R720 27Q7NZ1"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201312]
["+", "cpuarch", "x86_64"]
@@ -38,6 +39,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-2: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R720 B6Q7NZ1"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201312]
["+", "cpuarch", "x86_64"]
@@ -73,6 +75,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-3: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R720 G5Q7NZ1"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201312]
["+", "cpuarch", "x86_64"]
@@ -108,6 +111,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "MULTIPLE"]
clustera-4: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R720 66Q7NZ1"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201312]
["+", "cpuarch", "x86_64"]
@@ -141,4 +145,4 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "switch", "gw"]
["+", "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, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, 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, 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_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 39f7f1d7e559ca63d82b42944cf353fb90336ddc..0e5d7d06928fca05e5a5a240e392b19d4ff949e2 100644
--- a/spec/output/graphite_empty_print_stdout.txt
+++ b/spec/output/graphite_empty_print_stdout.txt
@@ -59,6 +59,7 @@ property_exist 'cpucore' || oarproperty -a cpucore
property_exist 'cputype' || oarproperty -a cputype --varchar
property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
property_exist 'disktype' || oarproperty -a disktype --varchar
+property_exist 'chassis' || oarproperty -a chassis --varchar
property_exist 'eth_count' || oarproperty -a eth_count
property_exist 'eth_rate' || oarproperty -a eth_rate
property_exist 'ib_count' || oarproperty -a ib_count
@@ -103,7 +104,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakes
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -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' -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_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 cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II' -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_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 '================================================================================'
@@ -128,7 +129,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -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' -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_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 cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II' -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_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 '================================================================================'
@@ -153,7 +154,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakes
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -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' -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_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 cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II' -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_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 '================================================================================'
@@ -178,6 +179,6 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakes
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -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' -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_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 cputype='Intel Xeon E5-2650' -p cpufreq='2.0' -p disktype='SATA II' -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_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 8420f1bb004c83ec4a626eaaf0000849ca6764db..02b972198f4be27af0fa7961bb1a2e16d421767e 100644
--- a/spec/output/grimoire_empty_diff_stdout.txt
+++ b/spec/output/grimoire_empty_diff_stdout.txt
@@ -3,6 +3,7 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakes
Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
clustera-1: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -38,6 +39,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-2: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -73,6 +75,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-3: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -108,6 +111,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-4: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -143,6 +147,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-5: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -178,6 +183,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-6: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -213,6 +219,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-7: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -248,6 +255,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-8: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201601]
["+", "cpuarch", "x86_64"]
@@ -721,4 +729,4 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "maintenance", "NO"]
["+", "network_address", ""]
["+", "production", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count, disk, diskpath
+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_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count, disk, diskpath
diff --git a/spec/output/grimoire_empty_print_stdout.txt b/spec/output/grimoire_empty_print_stdout.txt
index ca50952be9a7d39f635ee1b3f5cba19a24429175..2e05054a31b7fe5e59930a771e35d73890e17205 100644
--- a/spec/output/grimoire_empty_print_stdout.txt
+++ b/spec/output/grimoire_empty_print_stdout.txt
@@ -59,6 +59,7 @@ property_exist 'cpucore' || oarproperty -a cpucore
property_exist 'cputype' || oarproperty -a cputype --varchar
property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
property_exist 'disktype' || oarproperty -a disktype --varchar
+property_exist 'chassis' || oarproperty -a chassis --varchar
property_exist 'eth_count' || oarproperty -a eth_count
property_exist 'eth_rate' || oarproperty -a eth_rate
property_exist 'ib_count' || oarproperty -a ib_count
@@ -105,7 +106,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakes
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -170,7 +171,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -235,7 +236,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakes
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -300,7 +301,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakes
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -365,7 +366,7 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -p host='clustera-5.fakes
oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=79 -p cpuset=13
oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -430,7 +431,7 @@ oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -p host='clustera-6.fakes
oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=95 -p cpuset=13
oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -495,7 +496,7 @@ oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -p host='clustera-7.fakes
oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=111 -p cpuset=13
oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -560,7 +561,7 @@ oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -p host='clustera-8.fakes
oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=127 -p cpuset=13
oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
diff --git a/spec/output/grue_empty_diff_stdout.txt b/spec/output/grue_empty_diff_stdout.txt
index feb35f78f37213f45688246297aa1dfe4476a94b..d78046300b7447bb0481a777f04457979bc029fc 100644
--- a/spec/output/grue_empty_diff_stdout.txt
+++ b/spec/output/grue_empty_diff_stdout.txt
@@ -3,6 +3,7 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakes
Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
clustera-1: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R7425 FVJVY03"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201911]
["+", "cpuarch", "x86_64"]
@@ -38,6 +39,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "NO"]
clustera-2: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R7425 DVJVY03"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201911]
["+", "cpuarch", "x86_64"]
@@ -73,6 +75,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "NO"]
clustera-3: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R7425 CVJVY03"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201911]
["+", "cpuarch", "x86_64"]
@@ -108,6 +111,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "NO"]
clustera-4: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R7425 GVJVY03"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201911]
["+", "cpuarch", "x86_64"]
@@ -143,6 +147,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "NO"]
clustera-5: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R7425 BVJVY03"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201911]
["+", "cpuarch", "x86_64"]
@@ -176,4 +181,4 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "switch", "gw"]
["+", "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, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, 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, 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_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 c9389f7967aba8441b454fa878e0bfeb4f9d24ce..a33a2eaacc61f3a2282b4fd7268cb632f5633310 100644
--- a/spec/output/grue_empty_print_stdout.txt
+++ b/spec/output/grue_empty_print_stdout.txt
@@ -59,6 +59,7 @@ property_exist 'cpucore' || oarproperty -a cpucore
property_exist 'cputype' || oarproperty -a cputype --varchar
property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
property_exist 'disktype' || oarproperty -a disktype --varchar
+property_exist 'chassis' || oarproperty -a chassis --varchar
property_exist 'eth_count' || oarproperty -a eth_count
property_exist 'eth_rate' || oarproperty -a eth_rate
property_exist 'ib_count' || oarproperty -a ib_count
@@ -119,7 +120,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakes
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -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' -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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -160,7 +161,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -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' -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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -201,7 +202,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakes
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -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' -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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -242,7 +243,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakes
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -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' -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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -283,6 +284,6 @@ oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -p host='clustera-5.fakes
oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -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' -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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 3e821fa7f2d0d458db209d03f8f05b651ee9d9c4..36590175685f7dcd9de09c8cfb0f68ae3df79e9e 100644
--- a/spec/output/grue_nogpus_diff_stdout.txt
+++ b/spec/output/grue_nogpus_diff_stdout.txt
@@ -3,16 +3,45 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakes
Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
clustera-1:
["-", "opa", "NO"]
+ ["~", "chassis", nil, "Dell Inc. PowerEdge R7425 FVJVY03"]
["~", "maintenance", "YES", "NO"]
["~", "nodemodel", "R7425", "Dell PowerEdge R7425"]
["~", "production", "NO", "YES"]
["~", "switch", "gw-nancy", "gw"]
["+", "exotic", "NO"]
- 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: exotic
+ clustera-2:
+ ["-", "opa", "NO"]
+ ["~", "chassis", nil, "Dell Inc. PowerEdge R7425 DVJVY03"]
+ ["~", "maintenance", "YES", "NO"]
+ ["~", "nodemodel", "R7425", "Dell PowerEdge R7425"]
+ ["~", "production", "NO", "YES"]
+ ["~", "switch", "gw-nancy", "gw"]
+ ["+", "exotic", "NO"]
+ clustera-3:
+ ["-", "opa", "NO"]
+ ["~", "chassis", nil, "Dell Inc. PowerEdge R7425 CVJVY03"]
+ ["~", "maintenance", "YES", "NO"]
+ ["~", "nodemodel", "R7425", "Dell PowerEdge R7425"]
+ ["~", "production", "NO", "YES"]
+ ["~", "switch", "gw-nancy", "gw"]
+ ["+", "exotic", "NO"]
+ clustera-4:
+ ["-", "opa", "NO"]
+ ["~", "chassis", nil, "Dell Inc. PowerEdge R7425 GVJVY03"]
+ ["~", "maintenance", "YES", "NO"]
+ ["~", "nodemodel", "R7425", "Dell PowerEdge R7425"]
+ ["~", "production", "NO", "YES"]
+ ["~", "switch", "gw-nancy", "gw"]
+ ["+", "exotic", "NO"]
+ clustera-5:
+ ["-", "opa", "NO"]
+ ["~", "chassis", nil, "Dell Inc. PowerEdge R7425 BVJVY03"]
+ ["~", "maintenance", "YES", "NO"]
+ ["~", "nodemodel", "R7425", "Dell PowerEdge R7425"]
+ ["~", "production", "NO", "YES"]
+ ["~", "switch", "gw-nancy", "gw"]
+ ["+", "exotic", "NO"]
+Properties that need to be created on the fakesite server: chassis, exotic
Properties existing on the fakesite server but not managed/known by the generator: opa, 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 9ebdb1e3538ecb72079a91eabf1ef0dd882d4afc..ff9938d81676740156046d39662c747bd75d17c3 100644
--- a/spec/output/grue_nogpus_print_stdout.txt
+++ b/spec/output/grue_nogpus_print_stdout.txt
@@ -59,6 +59,7 @@ property_exist 'cpucore' || oarproperty -a cpucore
property_exist 'cputype' || oarproperty -a cputype --varchar
property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
property_exist 'disktype' || oarproperty -a disktype --varchar
+property_exist 'chassis' || oarproperty -a chassis --varchar
property_exist 'eth_count' || oarproperty -a eth_count
property_exist 'eth_rate' || oarproperty -a eth_rate
property_exist 'ib_count' || oarproperty -a ib_count
@@ -119,7 +120,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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -160,7 +161,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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -201,7 +202,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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -242,7 +243,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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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 '================================================================================'
@@ -283,6 +284,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' -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_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 cputype='AMD EPYC 7351' -p cpufreq='2.4' -p disktype='SAS' -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_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/yeti_empty_diff_stdout.txt b/spec/output/yeti_empty_diff_stdout.txt
index cbe0b6912cf7a9e11b2114722e67bbd49e6b30b8..1910883ad316d9dc6370c41cb1825432a598acdf 100644
--- a/spec/output/yeti_empty_diff_stdout.txt
+++ b/spec/output/yeti_empty_diff_stdout.txt
@@ -3,6 +3,7 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakes
Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
clustera-1: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201801]
["+", "cpuarch", "x86_64"]
@@ -38,6 +39,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-2: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201801]
["+", "cpuarch", "x86_64"]
@@ -73,6 +75,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-3: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201801]
["+", "cpuarch", "x86_64"]
@@ -108,6 +111,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "wattmeter", "YES"]
clustera-4: new node !
["+", "besteffort", "YES"]
+ ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
["+", "cluster", "clustera"]
["+", "cluster_priority", 201801]
["+", "cpuarch", "x86_64"]
@@ -273,4 +277,4 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
["+", "maintenance", "NO"]
["+", "network_address", ""]
["+", "production", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count, disk, diskpath
+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_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count, disk, diskpath
diff --git a/spec/output/yeti_empty_print_stdout.txt b/spec/output/yeti_empty_print_stdout.txt
index 57b431ef76b4a505178356b5928bca203ded7206..d15e9a087cfaa71b3e671f3d01ad1f694774a8e6 100644
--- a/spec/output/yeti_empty_print_stdout.txt
+++ b/spec/output/yeti_empty_print_stdout.txt
@@ -59,6 +59,7 @@ property_exist 'cpucore' || oarproperty -a cpucore
property_exist 'cputype' || oarproperty -a cputype --varchar
property_exist 'cpufreq' || oarproperty -a cpufreq --varchar
property_exist 'disktype' || oarproperty -a disktype --varchar
+property_exist 'chassis' || oarproperty -a chassis --varchar
property_exist 'eth_count' || oarproperty -a eth_count
property_exist 'eth_rate' || oarproperty -a eth_rate
property_exist 'ib_count' || oarproperty -a ib_count
@@ -153,7 +154,7 @@ oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakes
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -p host='clustera-1.fakesite.grid5000.fr' -p cpu=4 -p core=63 -p cpuset=59
oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -250,7 +251,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=127 -p cpuset=59
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -347,7 +348,7 @@ oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakes
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -p host='clustera-3.fakesite.grid5000.fr' -p cpu=12 -p core=191 -p cpuset=59
oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -444,7 +445,7 @@ oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakes
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -p host='clustera-4.fakesite.grid5000.fr' -p cpu=16 -p core=255 -p cpuset=59
oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -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' -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
+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' -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
echo '================================================================================'
echo; echo 'Adding disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'