From c5b9c477f6cf15f9e86a442866827ad0a3b1712b Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Fri, 4 Sep 2020 16:15:19 +0200
Subject: [PATCH] [spec] fix spec with new disk properties

---
 spec/oar_properties_spec.rb                   |  190 ++-
 spec/output/grimoire_empty_diff_stdout.txt    | 1242 ++++++++++++++++-
 spec/output/grimoire_empty_print_stdout.txt   |   80 +-
 spec/output/yeti_empty_diff_stdout.txt        |  374 ++++-
 spec/output/yeti_empty_print_stdout.txt       |   24 +-
 ...r_api_configured_server_quirk_cluster.json |  330 ++---
 ...p_oar_api_configured_server_with_disk.json |  333 ++---
 ...oar_api_configured_server_without_gpu.json |  330 ++---
 8 files changed, 2360 insertions(+), 543 deletions(-)

diff --git a/spec/oar_properties_spec.rb b/spec/oar_properties_spec.rb
index a1e50082a3..a05e61c267 100644
--- a/spec/oar_properties_spec.rb
+++ b/spec/oar_properties_spec.rb
@@ -972,7 +972,7 @@ disk_exist 'clusterb-2.fakesite.grid5000.fr' 'sdd.clusterb-2' && echo '=> disk a
 disk_exist 'clusterb-2.fakesite.grid5000.fr' 'sdd.clusterb-2' || oarnodesetting -a -h '' -p host='clusterb-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clusterb-2'
 
 echo; echo 'Setting properties for disk sdd.clusterb-2 on host clusterb-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clusterb-2'" -p cluster='clusterb' -p host='clusterb-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='YES' -p maintenance='NO' -p disk='sdd.clusterb-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clusterb-2'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -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_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=0 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3 -p host='clusterb-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clusterb-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 TXT
 
       generator_output = capture do
@@ -1085,70 +1085,256 @@ TXT
       expected_clusterb3_diff =  <<-TXT
   ["clusterb-1", "sdb.clusterb-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clusterb"]
+    ["+", "cluster_priority", 201906]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Silver 4110"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clusterb-1"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SATA"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 4]
     ["+", "host", "clusterb-1.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.64.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge T640"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "YES"]
+    ["+", "switch", nil]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "MULTIPLE"]
   ["clusterb-1", "sdc.clusterb-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clusterb"]
+    ["+", "cluster_priority", 201906]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Silver 4110"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clusterb-1"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SATA"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 4]
     ["+", "host", "clusterb-1.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.64.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge T640"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "YES"]
+    ["+", "switch", nil]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "MULTIPLE"]
   ["clusterb-1", "sdd.clusterb-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge T640 FL1CBX2"]
     ["+", "cluster", "clusterb"]
+    ["+", "cluster_priority", 201906]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Silver 4110"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clusterb-1"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SATA"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 4]
     ["+", "host", "clusterb-1.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.64.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge T640"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "YES"]
+    ["+", "switch", nil]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "MULTIPLE"]
   ["clusterb-2", "sdb.clusterb-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clusterb"]
+    ["+", "cluster_priority", 201906]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Silver 4110"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clusterb-2"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SATA"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 4]
     ["+", "host", "clusterb-2.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.64.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge T640"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "YES"]
+    ["+", "switch", nil]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "MULTIPLE"]
   ["clusterb-2", "sdc.clusterb-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clusterb"]
+    ["+", "cluster_priority", 201906]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Silver 4110"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clusterb-2"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SATA"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 4]
     ["+", "host", "clusterb-2.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.64.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge T640"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "YES"]
+    ["+", "switch", nil]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "MULTIPLE"]
   ["clusterb-2", "sdd.clusterb-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge T640 9L1CBX2"]
     ["+", "cluster", "clusterb"]
+    ["+", "cluster_priority", 201906]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Silver 4110"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clusterb-2"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SATA"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 4]
     ["+", "host", "clusterb-2.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.64.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge T640"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "YES"]
+    ["+", "switch", nil]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "MULTIPLE"]
 TXT
 
       generator_output = capture do
@@ -2501,7 +2687,7 @@ disk_exist 'clusterb-1.fakesite.grid5000.fr' 'sdb.clusterb-1' && echo '=> disk a
 disk_exist 'clusterb-1.fakesite.grid5000.fr' 'sdb.clusterb-1' || oarnodesetting -a -h '' -p host='clusterb-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clusterb-1'
 
 echo; echo 'Setting properties for disk sdb.clusterb-1 on host clusterb-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clusterb-1'" -p cluster='clusterb' -p host='clusterb-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='YES' -p maintenance='NO' -p disk='sdb.clusterb-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
+oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clusterb-1'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -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=0 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3 -p host='clusterb-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clusterb-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
       TXT
 
       expected_output4 = <<-TXT
diff --git a/spec/output/grimoire_empty_diff_stdout.txt b/spec/output/grimoire_empty_diff_stdout.txt
index 02b972198f..db15b68257 100644
--- a/spec/output/grimoire_empty_diff_stdout.txt
+++ b/spec/output/grimoire_empty_diff_stdout.txt
@@ -291,442 +291,1682 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdb.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-1"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-1", "sdc.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-1"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-1", "sdd.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-1"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-1", "sde.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-1"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-1", "sdf.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z13J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-1"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdb.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-2"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdc.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-2"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdd.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-2"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sde.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-2"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdf.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3Z0ZH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-2"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdb.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-3"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdc.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-3"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdd.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-3"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sde.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-3"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdf.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3YZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-3"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdb.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-4"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdc.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-4"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdd.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-4"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sde.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-4"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdf.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36ZYH82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-4"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-5", "sdb.clustera-5"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-5"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-5.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.5"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-5", "sdc.clustera-5"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-5"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-5.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.5"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-5", "sdd.clustera-5"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-5"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-5.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.5"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-5", "sde.clustera-5"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-5"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-5.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.5"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-5", "sdf.clustera-5"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36X1J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-5"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-5.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.5"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-6", "sdb.clustera-6"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-6"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-6.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.6"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-6", "sdc.clustera-6"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-6"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-6.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.6"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-6", "sdd.clustera-6"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-6"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-6.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.6"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-6", "sde.clustera-6"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-6"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-6.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.6"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-6", "sdf.clustera-6"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3722J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-6"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-6.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.6"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-7", "sdb.clustera-7"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-7"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-7.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.7"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-7", "sdc.clustera-7"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-7"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-7.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.7"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-7", "sdd.clustera-7"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-7"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-7.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.7"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-7", "sde.clustera-7"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-7"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-7.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.7"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-7", "sdf.clustera-7"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 36Y3J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-7"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-7.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.7"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-8", "sdb.clustera-8"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-8"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-8.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.8"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-8", "sdc.clustera-8"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-8"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-8.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.8"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-8", "sdd.clustera-8"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-8"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-8.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.8"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-8", "sde.clustera-8"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sde.clustera-8"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-8.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.8"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-8", "sdf.clustera-8"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R630 3703J82"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201601]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 8]
+    ["+", "cpufreq", "2.4"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon E5-2630 v3"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdf.clustera-8"]
+    ["+", "disk_reservation_count", 5]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0"]
+    ["+", "disktype", "SCSI"]
+    ["+", "eth_count", 4]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-8.fakesite.grid5000.fr"]
+    ["+", "ib", "FDR"]
+    ["+", "ib_count", 1]
+    ["+", "ib_rate", 56]
+    ["+", "ip", "172.16.71.8"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 8192]
+    ["+", "memcpu", 65536]
+    ["+", "memnode", 131072]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R630"]
+    ["+", "opa_count", 0]
+    ["+", "opa_rate", 0]
     ["+", "production", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count, disk, diskpath
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/grimoire_empty_print_stdout.txt b/spec/output/grimoire_empty_print_stdout.txt
index 2e05054a31..e0bcd1fe39 100644
--- a/spec/output/grimoire_empty_print_stdout.txt
+++ b/spec/output/grimoire_empty_print_stdout.txt
@@ -114,7 +114,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-1'
 
 echo; echo 'Setting properties for disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -122,7 +122,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-1'
 
 echo; echo 'Setting properties for disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -130,7 +130,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-1'
 
 echo; echo 'Setting properties for disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -138,7 +138,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sde.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sde.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-1'
 
 echo; echo 'Setting properties for disk sde.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -146,7 +146,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdf.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdf.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-1'
 
 echo; echo 'Setting properties for disk sdf.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-1'" -p ip='172.16.71.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -179,7 +179,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-2'
 
 echo; echo 'Setting properties for disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -187,7 +187,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-2'
 
 echo; echo 'Setting properties for disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -195,7 +195,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-2'
 
 echo; echo 'Setting properties for disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -203,7 +203,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sde.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sde.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-2'
 
 echo; echo 'Setting properties for disk sde.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -211,7 +211,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdf.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdf.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-2'
 
 echo; echo 'Setting properties for disk sdf.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-2'" -p ip='172.16.71.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -244,7 +244,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-3'
 
 echo; echo 'Setting properties for disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -252,7 +252,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-3'
 
 echo; echo 'Setting properties for disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -260,7 +260,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-3'
 
 echo; echo 'Setting properties for disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -268,7 +268,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sde.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sde.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-3'
 
 echo; echo 'Setting properties for disk sde.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -276,7 +276,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdf.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdf.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-3'
 
 echo; echo 'Setting properties for disk sdf.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-3'" -p ip='172.16.71.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -309,7 +309,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-4'
 
 echo; echo 'Setting properties for disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -317,7 +317,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-4'
 
 echo; echo 'Setting properties for disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -325,7 +325,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-4'
 
 echo; echo 'Setting properties for disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -333,7 +333,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sde.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sde.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-4'
 
 echo; echo 'Setting properties for disk sde.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -341,7 +341,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdf.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdf.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-4'
 
 echo; echo 'Setting properties for disk sdf.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-4'" -p ip='172.16.71.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -374,7 +374,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdb.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdb.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-5'
 
 echo; echo 'Setting properties for disk sdb.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-5'" -p cluster='clustera' -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -382,7 +382,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdc.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdc.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-5'
 
 echo; echo 'Setting properties for disk sdc.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-5'" -p cluster='clustera' -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -390,7 +390,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdd.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdd.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-5'
 
 echo; echo 'Setting properties for disk sdd.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-5'" -p cluster='clustera' -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -398,7 +398,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sde.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sde.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-5'
 
 echo; echo 'Setting properties for disk sde.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-5'" -p cluster='clustera' -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -406,7 +406,7 @@ disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdf.clustera-5' && echo '=> disk a
 disk_exist 'clustera-5.fakesite.grid5000.fr' 'sdf.clustera-5' || oarnodesetting -a -h '' -p host='clustera-5.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-5'
 
 echo; echo 'Setting properties for disk sdf.clustera-5 on host clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-5'" -p cluster='clustera' -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-5'" -p ip='172.16.71.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-5.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-5' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -439,7 +439,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdb.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdb.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-6'
 
 echo; echo 'Setting properties for disk sdb.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-6'" -p cluster='clustera' -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -447,7 +447,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdc.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdc.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-6'
 
 echo; echo 'Setting properties for disk sdc.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-6'" -p cluster='clustera' -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -455,7 +455,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdd.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdd.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-6'
 
 echo; echo 'Setting properties for disk sdd.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-6'" -p cluster='clustera' -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -463,7 +463,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sde.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sde.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-6'
 
 echo; echo 'Setting properties for disk sde.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-6'" -p cluster='clustera' -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -471,7 +471,7 @@ disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdf.clustera-6' && echo '=> disk a
 disk_exist 'clustera-6.fakesite.grid5000.fr' 'sdf.clustera-6' || oarnodesetting -a -h '' -p host='clustera-6.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-6'
 
 echo; echo 'Setting properties for disk sdf.clustera-6 on host clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-6'" -p cluster='clustera' -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-6'" -p ip='172.16.71.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-6.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-6' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -504,7 +504,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdb.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdb.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-7'
 
 echo; echo 'Setting properties for disk sdb.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-7'" -p cluster='clustera' -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -512,7 +512,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdc.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdc.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-7'
 
 echo; echo 'Setting properties for disk sdc.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-7'" -p cluster='clustera' -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -520,7 +520,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdd.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdd.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-7'
 
 echo; echo 'Setting properties for disk sdd.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-7'" -p cluster='clustera' -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -528,7 +528,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sde.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sde.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-7'
 
 echo; echo 'Setting properties for disk sde.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-7'" -p cluster='clustera' -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -536,7 +536,7 @@ disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdf.clustera-7' && echo '=> disk a
 disk_exist 'clustera-7.fakesite.grid5000.fr' 'sdf.clustera-7' || oarnodesetting -a -h '' -p host='clustera-7.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-7'
 
 echo; echo 'Setting properties for disk sdf.clustera-7 on host clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-7'" -p cluster='clustera' -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-7'" -p ip='172.16.71.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-7.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-7' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -569,7 +569,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdb.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdb.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-8'
 
 echo; echo 'Setting properties for disk sdb.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-8'" -p cluster='clustera' -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -577,7 +577,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdc.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdc.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-8'
 
 echo; echo 'Setting properties for disk sdc.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-8'" -p cluster='clustera' -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -585,7 +585,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdd.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdd.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-8'
 
 echo; echo 'Setting properties for disk sdd.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-8'" -p cluster='clustera' -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -593,7 +593,7 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sde.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sde.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sde.clustera-8'
 
 echo; echo 'Setting properties for disk sde.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-8'" -p cluster='clustera' -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sde.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sde.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sde.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:4:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -601,6 +601,6 @@ disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdf.clustera-8' && echo '=> disk a
 disk_exist 'clustera-8.fakesite.grid5000.fr' 'sdf.clustera-8' || oarnodesetting -a -h '' -p host='clustera-8.fakesite.grid5000.fr' -p type='disk' -p disk='sdf.clustera-8'
 
 echo; echo 'Setting properties for disk sdf.clustera-8 on host clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-8'" -p cluster='clustera' -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdf.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='disk' and disk='sdf.clustera-8'" -p ip='172.16.71.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge R630' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201601 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=5 -p host='clustera-8.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdf.clustera-8' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:5:0' -p cpuset=-1
 
 echo '================================================================================'
diff --git a/spec/output/yeti_empty_diff_stdout.txt b/spec/output/yeti_empty_diff_stdout.txt
index 1910883ad3..bba69fe177 100644
--- a/spec/output/yeti_empty_diff_stdout.txt
+++ b/spec/output/yeti_empty_diff_stdout.txt
@@ -147,134 +147,506 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "wattmeter", "YES"]
   ["clustera-1", "sdb.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-1"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-1", "sdc.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-1"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-1", "sdd.clustera-1"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGQSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-1"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-1.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.1"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdb.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-2"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdc.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-2"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-2", "sdd.clustera-2"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGRSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-2"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-2.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.2"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdb.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-3"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdc.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-3"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-3", "sdd.clustera-3"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGPSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-3"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-3.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.3"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdb.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdb.clustera-4"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdc.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdc.clustera-4"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
   ["clustera-4", "sdd.clustera-4"]: new disk !
     ["+", "available_upto", 0]
+    ["+", "besteffort", "YES"]
+    ["+", "chassis", "Dell Inc. PowerEdge R940 6FGMSM2"]
     ["+", "cluster", "clustera"]
+    ["+", "cluster_priority", 201801]
+    ["+", "cpuarch", "x86_64"]
+    ["+", "cpucore", 16]
+    ["+", "cpufreq", "2.1"]
     ["+", "cpuset", -1]
+    ["+", "cputype", "Intel Xeon Gold 6130"]
     ["+", "deploy", "YES"]
     ["+", "disk", "sdd.clustera-4"]
+    ["+", "disk_reservation_count", 3]
     ["+", "diskpath", "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"]
+    ["+", "disktype", "SAS"]
+    ["+", "eth_count", 1]
+    ["+", "eth_rate", 10]
+    ["+", "exotic", "NO"]
+    ["+", "gpu_count", 0]
     ["+", "host", "clustera-4.fakesite.grid5000.fr"]
+    ["+", "ib", "NO"]
+    ["+", "ib_count", 0]
+    ["+", "ib_rate", 0]
+    ["+", "ip", "172.16.19.4"]
     ["+", "maintenance", "NO"]
+    ["+", "max_walltime", 0]
+    ["+", "memcore", 12288]
+    ["+", "memcpu", 196608]
+    ["+", "memnode", 786432]
+    ["+", "mic", "NO"]
+    ["+", "myri", "NO"]
+    ["+", "myri_count", 0]
+    ["+", "myri_rate", 0]
     ["+", "network_address", ""]
+    ["+", "nodemodel", "Dell PowerEdge R940"]
+    ["+", "opa_count", 1]
+    ["+", "opa_rate", 100]
     ["+", "production", "NO"]
-Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count, disk, diskpath
+    ["+", "switch", "gw"]
+    ["+", "virtual", "ivt"]
+    ["+", "wattmeter", "YES"]
+Properties that need to be created on the fakesite server: ip, cluster, nodemodel, switch, besteffort, deploy, virtual, cpuarch, cpucore, cputype, cpufreq, disktype, chassis, eth_count, eth_rate, ib_count, ib_rate, ib, opa_count, opa_rate, myri_count, myri_rate, myri, memcore, memcpu, memnode, gpu_count, exotic, mic, wattmeter, cluster_priority, max_walltime, production, maintenance, disk_reservation_count
diff --git a/spec/output/yeti_empty_print_stdout.txt b/spec/output/yeti_empty_print_stdout.txt
index d15e9a087c..e4e10a7dfd 100644
--- a/spec/output/yeti_empty_print_stdout.txt
+++ b/spec/output/yeti_empty_print_stdout.txt
@@ -162,7 +162,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdb.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-1'
 
 echo; echo 'Setting properties for disk sdb.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -170,7 +170,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdc.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-1'
 
 echo; echo 'Setting properties for disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -178,7 +178,7 @@ disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' && echo '=> disk a
 disk_exist 'clustera-1.fakesite.grid5000.fr' 'sdd.clustera-1' || oarnodesetting -a -h '' -p host='clustera-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-1'
 
 echo; echo 'Setting properties for disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p cluster='clustera' -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-1'" -p ip='172.16.19.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-1' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -259,7 +259,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdb.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-2'
 
 echo; echo 'Setting properties for disk sdb.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -267,7 +267,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdc.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-2'
 
 echo; echo 'Setting properties for disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -275,7 +275,7 @@ disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' && echo '=> disk a
 disk_exist 'clustera-2.fakesite.grid5000.fr' 'sdd.clustera-2' || oarnodesetting -a -h '' -p host='clustera-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-2'
 
 echo; echo 'Setting properties for disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p cluster='clustera' -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-2'" -p ip='172.16.19.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-2' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -356,7 +356,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdb.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-3'
 
 echo; echo 'Setting properties for disk sdb.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -364,7 +364,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdc.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-3'
 
 echo; echo 'Setting properties for disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -372,7 +372,7 @@ disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' && echo '=> disk a
 disk_exist 'clustera-3.fakesite.grid5000.fr' 'sdd.clustera-3' || oarnodesetting -a -h '' -p host='clustera-3.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-3'
 
 echo; echo 'Setting properties for disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p cluster='clustera' -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-3'" -p ip='172.16.19.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-3.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-3' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
 
@@ -453,7 +453,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdb.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clustera-4'
 
 echo; echo 'Setting properties for disk sdb.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdb.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:1:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -461,7 +461,7 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdc.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdc.clustera-4'
 
 echo; echo 'Setting properties for disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdc.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdc.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:2:0' -p cpuset=-1
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -469,6 +469,6 @@ disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' && echo '=> disk a
 disk_exist 'clustera-4.fakesite.grid5000.fr' 'sdd.clustera-4' || oarnodesetting -a -h '' -p host='clustera-4.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clustera-4'
 
 echo; echo 'Setting properties for disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p cluster='clustera' -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p deploy='YES' -p production='NO' -p maintenance='NO' -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p exotic='NO' -p cpuset=-1
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='disk' and disk='sdd.clustera-4'" -p ip='172.16.19.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge R940' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=16 -p 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_model='NO' -p gpu_count=0 -p exotic='NO' -p mic='NO' -p wattmeter='YES' -p cluster_priority=201801 -p max_walltime=0 -p production='NO' -p maintenance='NO' -p disk_reservation_count=3 -p host='clustera-4.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clustera-4' -p diskpath='/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0' -p cpuset=-1
 
 echo '================================================================================'
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json b/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
index f07da1e976..363065ada2 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
@@ -1273,29 +1273,29 @@
          "api_timestamp" : 1569605253
       },
       {
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
-         "ib" : null,
+         "memcpu" : 65536,
+         "ib" : "NO",
          "production" : "YES",
-         "ib_rate" : null,
-         "virtual" : null,
+         "ib_rate" : 0,
+         "virtual" : "ivt",
          "network_address" : "",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null,
+         "mic" : "NO",
          "switch" : null,
          "disk" : "sdb.clusterc-1",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
-         "memcore" : null,
-         "wattmeter" : null,
-         "gpu_count" : null,
+         "memcore" : 8192,
+         "wattmeter" : "MULTIPLE",
+         "gpu_count" : 0,
          "deploy" : "YES",
          "available_upto" : 0,
          "suspended_jobs" : "NO",
-         "ip" : null,
-         "memnode" : null,
-         "cluster_priority" : null,
+         "ip" : "172.16.64.1",
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "links" : [
             {
                "href" : "//oarapi/resources/nodes/",
@@ -1315,14 +1315,14 @@
          "id" : 17,
          "last_job_date" : 0,
          "finaud_decision" : "NO",
-         "eth_count" : null,
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
+         "eth_count" : 1,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "myri_rate" : null,
-         "myri" : null,
-         "disktype" : null,
+         "myri_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
          "scheduler_priority" : 0,
          "type" : "disk",
          "core" : null,
@@ -1330,75 +1330,77 @@
          "cpu" : null,
          "next_finaud_decision" : "NO",
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "state_num" : 1,
-         "opa_rate" : null,
-         "cpucore" : null,
+         "opa_rate" : 0,
+         "cpucore" : 8,
          "maintenance" : "NO",
          "host" : "clusterc-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
          "gpu_model" : null,
          "besteffort" : "YES",
          "api_timestamp" : 1569605253,
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "cluster" : "clusterc",
-         "myri_count" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "myri_count" : 0,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "state" : "Alive",
-         "ib_count" : null,
+         "ib_count" : 0,
+         "exotic" : "NO",
          "cpuset" : -1
       },
       {
          "type" : "disk",
+         "exotic" : "NO",
          "scheduler_priority" : 0,
          "core" : null,
          "drain" : "NO",
          "next_finaud_decision" : "NO",
          "cpu" : null,
-         "myri_rate" : null,
-         "myri" : null,
-         "disktype" : null,
+         "myri_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
          "expiry_date" : 0,
          "last_available_upto" : 0,
          "finaud_decision" : "NO",
-         "eth_count" : null,
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
-         "cpuarch" : null,
-         "eth_rate" : null,
-         "ib_count" : null,
+         "eth_count" : 1,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
+         "cpuarch" : "x86_64",
+         "eth_rate" : 10,
+         "ib_count" : 0,
          "state" : "Alive",
          "cpuset" : -1,
          "api_timestamp" : 1569605253,
          "cluster" : "clusterc",
-         "cputype" : null,
-         "myri_count" : null,
+         "cputype" : "Intel Xeon Silver 4110",
+         "myri_count" : 0,
          "state_num" : 1,
-         "opa_rate" : null,
+         "opa_rate" : 0,
          "maintenance" : "NO",
-         "cpucore" : null,
+         "cpucore" : 8,
          "host" : "clusterc-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
          "gpu_model" : null,
          "besteffort" : "YES",
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null,
-         "ib_rate" : null,
+         "mic" : "NO",
+         "ib_rate" : 0,
          "network_address" : "",
-         "virtual" : null,
+         "virtual" : "ivt",
          "production" : "YES",
-         "ib" : null,
-         "opa_count" : null,
-         "memcpu" : null,
+         "ib" : "NO",
+         "opa_count" : 0,
+         "memcpu" : 65536,
          "next_state" : "UnChanged",
-         "memnode" : null,
-         "cluster_priority" : null,
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "last_job_date" : 0,
          "links" : [
             {
@@ -1420,69 +1422,70 @@
          "available_upto" : 0,
          "deploy" : "YES",
          "suspended_jobs" : "NO",
-         "ip" : null,
+         "ip" : "172.16.64.1",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
-         "memcore" : null,
-         "gpu_count" : null,
-         "wattmeter" : null,
+         "memcore" : 8192,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
          "switch" : null,
          "disk" : "sdc.clusterc-1"
       },
       {
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "eth_count" : null,
+         "eth_count" : 1,
          "finaud_decision" : "NO",
-         "cpufreq" : null,
-         "disk_reservation_count" : null,
+         "cpufreq" : "2.1",
+         "disk_reservation_count" : 3,
          "drain" : "NO",
          "core" : null,
          "scheduler_priority" : 0,
          "type" : "disk",
          "next_finaud_decision" : "NO",
          "cpu" : null,
-         "myri_rate" : null,
-         "disktype" : null,
-         "myri" : null,
-         "opa_rate" : null,
+         "myri_rate" : 0,
+         "disktype" : "SATA",
+         "myri" : "NO",
+         "opa_rate" : 0,
          "state_num" : 1,
          "besteffort" : "YES",
          "maintenance" : "NO",
          "host" : "clusterc-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
-         "cpucore" : null,
+         "cpucore" : 8,
          "gpu_model" : null,
-         "nodemodel" : null,
-         "max_walltime" : null,
+         "nodemodel" : "Dell PowerEdge T640",
+         "max_walltime" : 0,
          "gpu" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "cpuset" : -1,
          "state" : "Alive",
-         "ib_count" : null,
+         "ib_count" : 0,
          "api_timestamp" : 1569605253,
-         "myri_count" : null,
-         "cputype" : null,
+         "myri_count" : 0,
+         "cputype" : "Intel Xeon Silver 4110",
          "cluster" : "clusterc",
-         "ib" : null,
+         "ib" : "NO",
          "production" : "YES",
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
-         "mic" : null,
+         "memcpu" : 65536,
+         "mic" : "NO",
          "gpudevice" : null,
          "desktop_computing" : "NO",
          "network_address" : "",
-         "virtual" : null,
-         "ib_rate" : null,
+         "virtual" : "ivt",
+         "ib_rate" : 0,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
-         "gpu_count" : null,
-         "wattmeter" : null,
-         "memcore" : null,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
+         "memcore" : 8192,
          "switch" : null,
          "disk" : "sdd.clusterc-1",
-         "cluster_priority" : null,
-         "memnode" : null,
+         "cluster_priority" : 201906,
+         "memnode" : 131072,
+         "exotic" : "NO",
          "links" : [
             {
                "title" : "node",
@@ -1504,7 +1507,7 @@
          "suspended_jobs" : "NO",
          "available_upto" : 0,
          "deploy" : "YES",
-         "ip" : null
+         "ip" : "172.16.64.1"
       },
       {
          "eth_count" : 1,
@@ -2771,49 +2774,50 @@
          "production" : "YES"
       },
       {
-         "opa_rate" : null,
+         "opa_rate" : 0,
          "state_num" : 1,
          "besteffort" : "YES",
          "gpu_model" : null,
          "maintenance" : "NO",
-         "cpucore" : null,
+         "cpucore" : 8,
          "host" : "clusterc-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
-         "nodemodel" : null,
-         "max_walltime" : null,
+         "nodemodel" : "Dell PowerEdge T640",
+         "max_walltime" : 0,
          "gpu" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "cpuset" : -1,
-         "ib_count" : null,
+         "ib_count" : 0,
          "state" : "Alive",
          "api_timestamp" : 1569605253,
-         "myri_count" : null,
+         "myri_count" : 0,
          "cluster" : "clusterc",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "eth_count" : null,
+         "eth_count" : 1,
          "finaud_decision" : "NO",
-         "cpufreq" : null,
-         "disk_reservation_count" : null,
+         "cpufreq" : "2.1",
+         "disk_reservation_count" : 3,
          "drain" : "NO",
          "core" : null,
          "type" : "disk",
+         "exotic" :"NO",
          "scheduler_priority" : 0,
          "cpu" : null,
          "next_finaud_decision" : "NO",
-         "myri_rate" : null,
-         "myri" : null,
-         "disktype" : null,
+         "myri_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
-         "gpu_count" : null,
-         "wattmeter" : null,
-         "memcore" : null,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
+         "memcore" : 8192,
          "switch" : null,
          "disk" : "sdb.clusterc-2",
-         "cluster_priority" : null,
-         "memnode" : null,
+         "cluster_priority" : 201906,
+         "memnode" : 131072,
          "links" : [
             {
                "title" : "node",
@@ -2835,49 +2839,49 @@
          "suspended_jobs" : "NO",
          "available_upto" : 0,
          "deploy" : "YES",
-         "ip" : null,
-         "ib" : null,
+         "ip" : "172.16.64.2",
+         "ib" : "NO",
          "production" : "YES",
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
-         "mic" : null,
+         "memcpu" : 65536,
+         "mic" : "NO",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "virtual" : null,
+         "virtual" : "ivt",
          "network_address" : "",
-         "ib_rate" : null
+         "ib_rate" : 0
       },
       {
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "state_num" : 1,
-         "opa_rate" : null,
+         "opa_rate" : 0,
          "gpu_model" : null,
          "maintenance" : "NO",
-         "cpucore" : null,
+         "cpucore" : 8,
          "host" : "clusterc-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
          "besteffort" : "YES",
          "api_timestamp" : 1569605253,
          "cluster" : "clusterc",
-         "cputype" : null,
-         "myri_count" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "cputype" : "Intel Xeon Silver 4110",
+         "myri_count" : 0,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "state" : "Alive",
-         "ib_count" : null,
+         "ib_count" : 0,
          "cpuset" : -1,
          "finaud_decision" : "NO",
-         "eth_count" : null,
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
+         "eth_count" : 1,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "myri_rate" : null,
-         "disktype" : null,
-         "myri" : null,
+         "myri_rate" : 0,
+         "disktype" : "SATA",
+         "myri" : "NO",
          "scheduler_priority" : 0,
          "type" : "disk",
          "drain" : "NO",
@@ -2887,15 +2891,15 @@
          "switch" : null,
          "disk" : "sdc.clusterc-2",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
-         "memcore" : null,
-         "wattmeter" : null,
-         "gpu_count" : null,
+         "memcore" : 8192,
+         "wattmeter" : "MULTIPLE",
+         "gpu_count" : 0,
          "deploy" : "YES",
          "available_upto" : 0,
          "suspended_jobs" : "NO",
-         "ip" : null,
-         "memnode" : null,
-         "cluster_priority" : null,
+         "ip" : "172.16.64.2",
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "links" : [
             {
                "rel" : "member",
@@ -2914,55 +2918,56 @@
          ],
          "last_job_date" : 0,
          "id" : 37,
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
+         "memcpu" : 65536,
          "production" : "YES",
-         "ib" : null,
-         "ib_rate" : null,
-         "virtual" : null,
+         "ib" : "NO",
+         "ib_rate" : 0,
+         "virtual" : "ivt",
          "network_address" : "",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null
+         "mic" : "NO",
+         "exotic" : "NO"
       },
       {
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "cluster" : "clusterc",
-         "myri_count" : null,
+         "myri_count" : 0,
          "api_timestamp" : 1569605253,
-         "ib_count" : null,
+         "ib_count" : 0,
          "state" : "Alive",
          "cpuset" : -1,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "host" : "clusterc-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
          "maintenance" : "NO",
          "gpu_model" : null,
-         "cpucore" : null,
+         "cpucore" : 8,
          "besteffort" : "YES",
          "state_num" : 1,
-         "opa_rate" : null,
-         "myri" : null,
-         "disktype" : null,
-         "myri_rate" : null,
+         "opa_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
+         "myri_rate" : 0,
          "next_finaud_decision" : "NO",
          "cpu" : null,
          "scheduler_priority" : 0,
          "type" : "disk",
          "core" : null,
          "drain" : "NO",
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
          "finaud_decision" : "NO",
-         "eth_count" : null,
+         "eth_count" : 1,
          "last_available_upto" : 0,
          "expiry_date" : 0,
-         "ip" : null,
+         "ip" : "172.16.64.2",
          "deploy" : "YES",
          "available_upto" : 0,
          "suspended_jobs" : "NO",
@@ -2984,25 +2989,26 @@
             }
          ],
          "last_job_date" : 0,
-         "memnode" : null,
-         "cluster_priority" : null,
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "disk" : "sdd.clusterc-2",
          "switch" : null,
-         "memcore" : null,
-         "gpu_count" : null,
-         "wattmeter" : null,
+         "memcore" : 8192,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "network_address" : "",
-         "virtual" : null,
+         "virtual" : "ivt",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null,
-         "memcpu" : null,
+         "mic" : "NO",
+         "memcpu" : 65536,
          "next_state" : "UnChanged",
-         "opa_count" : null,
+         "opa_count" : 0,
          "production" : "YES",
-         "ib" : null
+         "exotic" : "NO",
+         "ib" : "NO"
       }
    ],
    "api_timestamp" : 1569605253
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
index 60857490fe..17f6e01c9d 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
@@ -1269,33 +1269,33 @@
       },
       {
          "core" : null,
-         "myri" : null,
+         "myri" : "NO",
          "besteffort" : "YES",
-         "myri_count" : null,
+         "myri_count" : 0,
          "cpu" : null,
-         "cpufreq" : null,
-         "cpucore" : null,
+         "cpufreq" : "2.1",
+         "cpucore" : 8,
          "deploy" : "YES",
          "last_job_date" : 0,
          "expiry_date" : 0,
-         "ib_count" : null,
-         "opa_count" : null,
+         "ib_count" : 0,
+         "opa_count" : 0,
          "drain" : "NO",
-         "eth_rate" : null,
+         "eth_rate" : 10,
          "cpuset" : -1,
          "network_address" : "",
          "suspended_jobs" : "NO",
-         "virtual" : null,
+         "virtual" : "ivt",
          "desktop_computing" : "NO",
          "cluster" : "clusterb",
          "id" : 17,
-         "cpuarch" : null,
-         "ip" : null,
-         "memcore" : null,
-         "memnode" : null,
+         "cpuarch" : "x86_64",
+         "ip" : "172.16.64.1",
+         "memcore" : 8192,
+         "memnode" : 131072,
          "available_upto" : 0,
-         "opa_rate" : null,
-         "wattmeter" : null,
+         "opa_rate" : 0,
+         "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
          "maintenance" : "NO",
          "links" : [
@@ -1314,49 +1314,51 @@
                "title" : "jobs"
             }
          ],
-         "cluster_priority" : null,
+         "cluster_priority" : 201906,
          "api_timestamp" : 1569497994,
-         "memcpu" : null,
+         "memcpu" : 65536,
          "gpudevice" : null,
-         "gpu_count" : null,
+         "gpu_count" : 4,
          "finaud_decision" : "NO",
          "gpu" : null,
          "next_finaud_decision" : "NO",
          "disk" : "sdb.clusterb-1",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "gpu_model" : null,
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
          "switch" : null,
-         "max_walltime" : null,
+         "max_walltime" : 0,
          "production" : "YES",
-         "disk_reservation_count" : null,
-         "disktype" : null,
-         "mic" : null,
+         "disk_reservation_count" : 3,
+         "disktype" : "SATA",
+         "mic" : "NO",
          "state" : "Alive",
          "scheduler_priority" : 0,
          "type" : "disk",
-         "ib" : null,
+         "ib" : "NO",
+         "exotic" : "NO",
          "state_num" : 1,
-         "myri_rate" : null,
-         "eth_count" : null,
-         "nodemodel" : null,
+         "myri_rate" : 0,
+         "eth_count" : 1,
+         "nodemodel" : "Dell PowerEdge T640",
          "next_state" : "UnChanged",
-         "host" : "clusterb-1.fakesite.grid5000.fr"
+         "host" : "clusterb-1.fakesite.grid5000.fr",
+         "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2"
       },
       {
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "gpu_model" : null,
          "disk" : "sdc.clusterb-1",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
          "gpu" : null,
          "finaud_decision" : "NO",
-         "gpu_count" : null,
+         "gpu_count" : 4,
          "gpudevice" : null,
-         "memcpu" : null,
+         "memcpu" : 65536,
          "api_timestamp" : 1569497994,
-         "cluster_priority" : null,
+         "cluster_priority" : 201906,
          "links" : [
             {
                "rel" : "member",
@@ -1375,104 +1377,106 @@
          ],
          "maintenance" : "NO",
          "last_available_upto" : 0,
-         "wattmeter" : null,
-         "nodemodel" : null,
+         "wattmeter" : "MULTIPLE",
+         "nodemodel" : "Dell PowerEdge T640",
          "next_state" : "UnChanged",
          "host" : "clusterb-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
-         "eth_count" : null,
-         "myri_rate" : null,
+         "eth_count" : 1,
+         "myri_rate" : 0,
          "state_num" : 1,
-         "ib" : null,
+         "ib" : "NO",
+         "exotic" : "NO",
          "type" : "disk",
          "state" : "Alive",
          "scheduler_priority" : 0,
-         "mic" : null,
-         "disktype" : null,
-         "disk_reservation_count" : null,
-         "max_walltime" : null,
+         "mic" : "NO",
+         "disktype" : "SATA",
+         "disk_reservation_count" : 3,
+         "max_walltime" : 0,
          "production" : "YES",
          "switch" : null,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
          "besteffort" : "YES",
-         "myri" : null,
+         "myri" : "NO",
          "core" : null,
-         "opa_rate" : null,
-         "memnode" : null,
+         "opa_rate" : 0,
+         "memnode" : 131072,
          "available_upto" : 0,
-         "memcore" : null,
-         "cpuarch" : null,
-         "ip" : null,
+         "memcore" : 8192,
+         "cpuarch" : "x86_64",
+         "ip" : "172.16.64.1",
          "cluster" : "clusterb",
          "id" : 18,
-         "virtual" : null,
+         "virtual" : "ivt",
          "desktop_computing" : "NO",
-         "eth_rate" : null,
+         "eth_rate" : 10,
          "cpuset" : -1,
          "drain" : "NO",
          "network_address" : "",
          "suspended_jobs" : "NO",
-         "opa_count" : null,
-         "ib_count" : null,
+         "opa_count" : 0,
+         "ib_count" : 0,
          "expiry_date" : 0,
-         "cpufreq" : null,
-         "myri_count" : null,
-         "cpucore" : null,
+         "cpufreq" : "2.1",
+         "myri_count" : 0,
+         "cpucore" : 8,
          "cpu" : null,
          "deploy" : "YES",
          "last_job_date" : 0
       },
       {
-         "eth_rate" : null,
+         "eth_rate" : 10,
          "drain" : "NO",
          "network_address" : "",
          "suspended_jobs" : "NO",
          "cpuset" : -1,
          "last_job_date" : 0,
-         "myri_count" : null,
-         "cpufreq" : null,
-         "cpucore" : null,
+         "myri_count" : 0,
+         "cpufreq" : "2.1",
+         "cpucore" : 8,
          "cpu" : null,
          "deploy" : "YES",
          "expiry_date" : 0,
-         "ib_count" : null,
-         "opa_count" : null,
-         "memnode" : null,
+         "ib_count" : 0,
+         "opa_count" : 0,
+         "memnode" : 131072,
          "available_upto" : 0,
-         "opa_rate" : null,
-         "virtual" : null,
+         "opa_rate" : 0,
+         "virtual" : "ivt",
          "desktop_computing" : "NO",
          "cluster" : "clusterb",
          "id" : 19,
-         "cpuarch" : null,
-         "ip" : null,
-         "memcore" : null,
+         "cpuarch" : "x86_64",
+         "ip" : "172.16.64.1",
+         "memcore" : 8192,
          "besteffort" : "YES",
-         "myri" : null,
+         "myri" : "NO",
          "core" : null,
-         "disktype" : null,
-         "mic" : null,
+         "disktype" : "SATA",
+         "mic" : "NO",
          "scheduler_priority" : 0,
          "state" : "Alive",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
          "switch" : null,
-         "max_walltime" : null,
+         "max_walltime" : 0,
          "production" : "YES",
-         "disk_reservation_count" : null,
-         "eth_count" : null,
-         "myri_rate" : null,
-         "nodemodel" : null,
+         "disk_reservation_count" : 3,
+         "eth_count" : 1,
+         "myri_rate" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "next_state" : "UnChanged",
          "host" : "clusterb-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
          "type" : "disk",
-         "ib" : null,
+         "ib" : "NO",
+         "exotic" : "NO",
          "state_num" : 1,
          "api_timestamp" : 1569497994,
-         "memcpu" : null,
+         "memcpu" : 65536,
          "gpudevice" : null,
-         "gpu_count" : null,
-         "wattmeter" : null,
+         "gpu_count" : 4,
+         "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
          "maintenance" : "NO",
          "links" : [
@@ -1491,11 +1495,11 @@
                "title" : "jobs"
             }
          ],
-         "cluster_priority" : null,
-         "cputype" : null,
+         "cluster_priority" : 201906,
+         "cputype" : "Intel Xeon Silver 4110",
          "disk" : "sdd.clusterb-1",
          "next_finaud_decision" : "NO",
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "gpu_model" : null,
          "finaud_decision" : "NO",
          "gpu" : null
@@ -2766,28 +2770,29 @@
       {
          "state_num" : 1,
          "type" : "disk",
-         "ib" : null,
-         "myri_rate" : null,
-         "eth_count" : null,
+         "ib" : "NO",
+         "exotic" : "NO",
+         "myri_rate" : 0,
+         "eth_count" : 1,
          "next_state" : "UnChanged",
-         "nodemodel" : null,
+         "nodemodel" : "Dell PowerEdge T640",
          "host" : "clusterb-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
-         "max_walltime" : null,
+         "max_walltime" : 0,
          "production" : "YES",
-         "disk_reservation_count" : null,
+         "disk_reservation_count" : 3,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
          "switch" : null,
-         "disktype" : null,
-         "mic" : null,
+         "disktype" : "SATA",
+         "mic" : "NO",
          "scheduler_priority" : 0,
          "state" : "Alive",
          "finaud_decision" : "NO",
          "gpu" : null,
          "gpu_model" : null,
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "disk" : "sdb.clusterb-2",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
          "maintenance" : "NO",
          "links" : [
@@ -2806,75 +2811,75 @@
                "title" : "jobs"
             }
          ],
-         "cluster_priority" : null,
-         "wattmeter" : null,
+         "cluster_priority" : 201906,
+         "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
          "gpudevice" : null,
-         "gpu_count" : null,
+         "gpu_count" : 4,
          "api_timestamp" : 1569497994,
-         "memcpu" : null,
-         "cpuarch" : null,
-         "ip" : null,
-         "memcore" : null,
-         "virtual" : null,
+         "memcpu" : 65536,
+         "cpuarch" : "x86_64",
+         "ip" : "172.16.64.2",
+         "memcore" : 8192,
+         "virtual" : "ivt",
          "desktop_computing" : "NO",
          "id" : 36,
          "cluster" : "clusterb",
-         "opa_rate" : null,
-         "memnode" : null,
+         "opa_rate" : 0,
+         "memnode" : 131072,
          "available_upto" : 0,
-         "opa_count" : null,
-         "myri_count" : null,
+         "opa_count" : 0,
+         "myri_count" : 0,
          "last_job_date" : 0,
-         "cpufreq" : null,
-         "cpucore" : null,
+         "cpufreq" : "2.1",
+         "cpucore" : 8,
          "cpu" : null,
          "deploy" : "YES",
          "expiry_date" : 0,
-         "ib_count" : null,
+         "ib_count" : 0,
          "suspended_jobs" : "NO",
-         "eth_rate" : null,
+         "eth_rate" : 10,
          "drain" : "NO",
          "network_address" : "",
          "cpuset" : -1,
-         "myri" : null,
+         "myri" : "NO",
          "core" : null,
          "besteffort" : "YES"
       },
       {
          "besteffort" : "YES",
          "core" : null,
-         "myri" : null,
-         "eth_rate" : null,
+         "myri" : "NO",
+         "eth_rate" : 10,
          "network_address" : "",
          "drain" : "NO",
          "cpuset" : -1,
          "suspended_jobs" : "NO",
-         "ib_count" : null,
+         "ib_count" : 0,
          "expiry_date" : 0,
-         "cpufreq" : null,
-         "myri_count" : null,
-         "cpucore" : null,
+         "cpufreq" : "2.1",
+         "myri_count" : 0,
+         "cpucore" : 8,
          "cpu" : null,
          "last_job_date" : 0,
          "deploy" : "YES",
-         "opa_count" : null,
+         "opa_count" : 0,
          "available_upto" : 0,
-         "memnode" : null,
-         "opa_rate" : null,
+         "memnode" : 131072,
+         "opa_rate" : 0,
          "id" : 37,
          "cluster" : "clusterb",
-         "virtual" : null,
+         "virtual" : "ivt",
          "desktop_computing" : "NO",
-         "memcore" : null,
-         "cpuarch" : null,
-         "ip" : null,
-         "memcpu" : null,
+         "memcore" : 8192,
+         "cpuarch" : "x86_64",
+         "ip" : "172.16.64.2",
+         "memcpu" : 65536,
          "api_timestamp" : 1569497994,
-         "gpu_count" : null,
+         "gpu_count" : 4,
          "gpudevice" : null,
          "last_available_upto" : 0,
-         "wattmeter" : null,
+         "wattmeter" : "MULTIPLE",
          "links" : [
             {
                "rel" : "member",
@@ -2891,47 +2896,48 @@
                "href" : "//oarapi/resources/37/jobs"
             }
          ],
-         "cluster_priority" : null,
+         "cluster_priority" : 201906,
          "maintenance" : "NO",
          "disk" : "sdc.clusterb-2",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
          "gpu_model" : null,
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "finaud_decision" : "NO",
          "gpu" : null,
          "state" : "Alive",
          "scheduler_priority" : 0,
-         "disktype" : null,
-         "mic" : null,
+         "disktype" : "SATA",
+         "mic" : "NO",
          "switch" : null,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
-         "disk_reservation_count" : null,
+         "disk_reservation_count" : 3,
          "production" : "YES",
-         "max_walltime" : null,
+         "max_walltime" : 0,
          "next_state" : "UnChanged",
          "host" : "clusterb-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
-         "nodemodel" : null,
-         "myri_rate" : null,
-         "eth_count" : null,
-         "ib" : null,
+         "nodemodel" : "Dell PowerEdge T640",
+         "myri_rate" : 0,
+         "eth_count" : 1,
+         "ib" : "NO",
+         "exotic" : "NO",
          "type" : "disk",
          "state_num" : 1
       },
       {
          "gpu_model" : null,
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "next_finaud_decision" : "NO",
          "disk" : "sdd.clusterb-2",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "gpu" : null,
          "finaud_decision" : "NO",
-         "gpu_count" : null,
+         "gpu_count" : 4,
          "gpudevice" : null,
-         "memcpu" : null,
+         "memcpu" : 65536,
          "api_timestamp" : 1569497994,
-         "cluster_priority" : null,
+         "cluster_priority" : 201906,
          "links" : [
             {
                "rel" : "member",
@@ -2950,50 +2956,51 @@
          ],
          "maintenance" : "NO",
          "last_available_upto" : 0,
-         "wattmeter" : null,
-         "nodemodel" : null,
+         "wattmeter" : "MULTIPLE",
+         "nodemodel" : "Dell PowerEdge T640",
          "next_state" : "UnChanged",
          "host" : "clusterb-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
-         "eth_count" : null,
-         "myri_rate" : null,
+         "eth_count" : 1,
+         "myri_rate" : 0,
          "state_num" : 1,
-         "ib" : null,
+         "ib" : "NO",
+         "exotic" : "NO",
          "type" : "disk",
          "state" : "Alive",
          "scheduler_priority" : 0,
-         "mic" : null,
-         "disktype" : null,
-         "disk_reservation_count" : null,
+         "mic" : "NO",
+         "disktype" : "SATA",
+         "disk_reservation_count" : 3,
          "production" : "YES",
-         "max_walltime" : null,
+         "max_walltime" : 0,
          "switch" : null,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
          "besteffort" : "YES",
          "core" : null,
-         "myri" : null,
-         "opa_rate" : null,
-         "memnode" : null,
+         "myri" : "NO",
+         "opa_rate" : 0,
+         "memnode" : 131072,
          "available_upto" : 0,
-         "memcore" : null,
-         "cpuarch" : null,
-         "ip" : null,
+         "memcore" : 8192,
+         "cpuarch" : "x86_64",
+         "ip" : "172.16.64.2",
          "cluster" : "clusterb",
          "id" : 38,
-         "virtual" : null,
+         "virtual" : "ivt",
          "desktop_computing" : "NO",
          "network_address" : "",
-         "eth_rate" : null,
+         "eth_rate" : 10,
          "drain" : "NO",
          "suspended_jobs" : "NO",
          "cpuset" : -1,
-         "opa_count" : null,
+         "opa_count" : 0,
          "expiry_date" : 0,
-         "ib_count" : null,
-         "myri_count" : null,
+         "ib_count" : 0,
+         "myri_count" : 0,
          "deploy" : "YES",
-         "cpufreq" : null,
-         "cpucore" : null,
+         "cpufreq" : "2.1",
+         "cpucore" : 8,
          "cpu" : null,
          "last_job_date" : 0
       }
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json b/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
index 8cd525db5e..40f248425f 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
@@ -1273,29 +1273,29 @@
          "api_timestamp" : 1569605253
       },
       {
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
-         "ib" : null,
+         "memcpu" : 65536,
+         "ib" : "NO",
          "production" : "YES",
-         "ib_rate" : null,
-         "virtual" : null,
+         "ib_rate" : 0,
+         "virtual" : "ivt",
          "network_address" : "",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null,
+         "mic" : "NO",
          "switch" : null,
          "disk" : "sdb.clusterc-1",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
-         "memcore" : null,
-         "wattmeter" : null,
-         "gpu_count" : null,
+         "memcore" : 8192,
+         "wattmeter" : "MULTIPLE",
+         "gpu_count" : 0,
          "deploy" : "YES",
          "available_upto" : 0,
          "suspended_jobs" : "NO",
-         "ip" : null,
-         "memnode" : null,
-         "cluster_priority" : null,
+         "ip" : "172.16.64.1",
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "links" : [
             {
                "href" : "//oarapi/resources/nodes/",
@@ -1315,90 +1315,92 @@
          "id" : 17,
          "last_job_date" : 0,
          "finaud_decision" : "NO",
-         "eth_count" : null,
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
+         "eth_count" : 1,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "myri_rate" : null,
-         "myri" : null,
-         "disktype" : null,
+         "myri_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
          "scheduler_priority" : 0,
          "type" : "disk",
+         "exotic" : "NO",
          "core" : null,
          "drain" : "NO",
          "cpu" : null,
          "next_finaud_decision" : "NO",
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "state_num" : 1,
-         "opa_rate" : null,
-         "cpucore" : null,
+         "opa_rate" : 0,
+         "cpucore" : 8,
          "maintenance" : "NO",
          "host" : "clusterc-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
          "gpu_model" : null,
          "besteffort" : "YES",
          "api_timestamp" : 1569605253,
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "cluster" : "clusterc",
-         "myri_count" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "myri_count" : 0,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "state" : "Alive",
-         "ib_count" : null,
+         "ib_count" : 0,
          "cpuset" : -1
       },
       {
          "type" : "disk",
+         "exotic" : "NO",
          "scheduler_priority" : 0,
          "core" : null,
          "drain" : "NO",
          "next_finaud_decision" : "NO",
          "cpu" : null,
-         "myri_rate" : null,
-         "myri" : null,
-         "disktype" : null,
+         "myri_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
          "expiry_date" : 0,
          "last_available_upto" : 0,
          "finaud_decision" : "NO",
-         "eth_count" : null,
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
-         "cpuarch" : null,
-         "eth_rate" : null,
-         "ib_count" : null,
+         "eth_count" : 1,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
+         "cpuarch" : "x86_64",
+         "eth_rate" : 10,
+         "ib_count" : 0,
          "state" : "Alive",
          "cpuset" : -1,
          "api_timestamp" : 1569605253,
          "cluster" : "clusterc",
-         "cputype" : null,
-         "myri_count" : null,
+         "cputype" : "Intel Xeon Silver 4110",
+         "myri_count" : 0,
          "state_num" : 1,
-         "opa_rate" : null,
+         "opa_rate" : 0,
          "maintenance" : "NO",
-         "cpucore" : null,
+         "cpucore" : 8,
          "host" : "clusterc-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
          "gpu_model" : null,
          "besteffort" : "YES",
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null,
-         "ib_rate" : null,
+         "mic" : "NO",
+         "ib_rate" : 0,
          "network_address" : "",
-         "virtual" : null,
+         "virtual" : "ivt",
          "production" : "YES",
-         "ib" : null,
-         "opa_count" : null,
-         "memcpu" : null,
+         "ib" : "NO",
+         "opa_count" : 0,
+         "memcpu" : 65536,
          "next_state" : "UnChanged",
-         "memnode" : null,
-         "cluster_priority" : null,
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "last_job_date" : 0,
          "links" : [
             {
@@ -1420,69 +1422,70 @@
          "available_upto" : 0,
          "deploy" : "YES",
          "suspended_jobs" : "NO",
-         "ip" : null,
+         "ip" : "172.16.64.1",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
-         "memcore" : null,
-         "gpu_count" : null,
-         "wattmeter" : null,
+         "memcore" : 8192,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
          "switch" : null,
          "disk" : "sdc.clusterc-1"
       },
       {
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "eth_count" : null,
+         "eth_count" : 1,
          "finaud_decision" : "NO",
-         "cpufreq" : null,
-         "disk_reservation_count" : null,
+         "cpufreq" : "2.1",
+         "disk_reservation_count" : 3,
          "drain" : "NO",
          "core" : null,
          "scheduler_priority" : 0,
          "type" : "disk",
          "next_finaud_decision" : "NO",
          "cpu" : null,
-         "myri_rate" : null,
-         "disktype" : null,
-         "myri" : null,
-         "opa_rate" : null,
+         "myri_rate" : 0,
+         "disktype" : "SATA",
+         "myri" : "NO",
+         "opa_rate" : 0,
          "state_num" : 1,
          "besteffort" : "YES",
          "maintenance" : "NO",
          "host" : "clusterc-1.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 FL1CBX2",
-         "cpucore" : null,
+         "cpucore" : 8,
          "gpu_model" : null,
-         "nodemodel" : null,
-         "max_walltime" : null,
+         "nodemodel" : "Dell PowerEdge T640",
+         "max_walltime" : 0,
          "gpu" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "eth_rate" : 10,
+         "exotic" : "NO",
+         "cpuarch" : "x86_64",
          "cpuset" : -1,
          "state" : "Alive",
-         "ib_count" : null,
+         "ib_count" : 0,
          "api_timestamp" : 1569605253,
-         "myri_count" : null,
-         "cputype" : null,
+         "myri_count" : 0,
+         "cputype" : "Intel Xeon Silver 4110",
          "cluster" : "clusterc",
-         "ib" : null,
+         "ib" : "NO",
          "production" : "YES",
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
-         "mic" : null,
+         "memcpu" : 65536,
+         "mic" : "NO",
          "gpudevice" : null,
          "desktop_computing" : "NO",
          "network_address" : "",
-         "virtual" : null,
-         "ib_rate" : null,
+         "virtual" : "ivt",
+         "ib_rate" : 0,
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
-         "gpu_count" : null,
-         "wattmeter" : null,
-         "memcore" : null,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
+         "memcore" : 8192,
          "switch" : null,
          "disk" : "sdd.clusterc-1",
-         "cluster_priority" : null,
-         "memnode" : null,
+         "cluster_priority" : 201906,
+         "memnode" : 131072,
          "links" : [
             {
                "title" : "node",
@@ -1504,7 +1507,7 @@
          "suspended_jobs" : "NO",
          "available_upto" : 0,
          "deploy" : "YES",
-         "ip" : null
+         "ip" : "172.16.64.1"
       },
       {
          "eth_count" : 1,
@@ -2771,49 +2774,50 @@
          "production" : "YES"
       },
       {
-         "opa_rate" : null,
+         "opa_rate" : 0,
          "state_num" : 1,
          "besteffort" : "YES",
          "gpu_model" : null,
          "maintenance" : "NO",
-         "cpucore" : null,
+         "cpucore" : 8,
          "host" : "clusterc-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
-         "nodemodel" : null,
-         "max_walltime" : null,
+         "nodemodel" : "Dell PowerEdge T640",
+         "max_walltime" : 0,
          "gpu" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "cpuset" : -1,
-         "ib_count" : null,
+         "ib_count" : 0,
          "state" : "Alive",
          "api_timestamp" : 1569605253,
-         "myri_count" : null,
+         "myri_count" : 0,
          "cluster" : "clusterc",
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "eth_count" : null,
+         "eth_count" : 1,
          "finaud_decision" : "NO",
-         "cpufreq" : null,
-         "disk_reservation_count" : null,
+         "cpufreq" : "2.1",
+         "disk_reservation_count" : 3,
          "drain" : "NO",
          "core" : null,
          "type" : "disk",
+         "exotic" : "NO",
          "scheduler_priority" : 0,
          "cpu" : null,
          "next_finaud_decision" : "NO",
-         "myri_rate" : null,
-         "myri" : null,
-         "disktype" : null,
+         "myri_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
-         "gpu_count" : null,
-         "wattmeter" : null,
-         "memcore" : null,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
+         "memcore" : 8192,
          "switch" : null,
          "disk" : "sdb.clusterc-2",
-         "cluster_priority" : null,
-         "memnode" : null,
+         "cluster_priority" : 201906,
+         "memnode" : 131072,
          "links" : [
             {
                "title" : "node",
@@ -2835,51 +2839,52 @@
          "suspended_jobs" : "NO",
          "available_upto" : 0,
          "deploy" : "YES",
-         "ip" : null,
-         "ib" : null,
+         "ip" : "172.16.64.2",
+         "ib" : "NO",
          "production" : "YES",
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
-         "mic" : null,
+         "memcpu" : 65536,
+         "mic" : "NO",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "virtual" : null,
+         "virtual" : "ivt",
          "network_address" : "",
-         "ib_rate" : null
+         "ib_rate" : 0
       },
       {
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "state_num" : 1,
-         "opa_rate" : null,
+         "opa_rate" : 0,
          "gpu_model" : null,
          "maintenance" : "NO",
-         "cpucore" : null,
+         "cpucore" : 8,
          "host" : "clusterc-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
          "besteffort" : "YES",
          "api_timestamp" : 1569605253,
          "cluster" : "clusterc",
-         "cputype" : null,
-         "myri_count" : null,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "cputype" : "Intel Xeon Silver 4110",
+         "myri_count" : 0,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "state" : "Alive",
-         "ib_count" : null,
+         "ib_count" : 0,
          "cpuset" : -1,
          "finaud_decision" : "NO",
-         "eth_count" : null,
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
+         "eth_count" : 1,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
          "expiry_date" : 0,
          "last_available_upto" : 0,
-         "myri_rate" : null,
-         "disktype" : null,
-         "myri" : null,
+         "myri_rate" : 0,
+         "disktype" : "SATA",
+         "myri" : "NO",
          "scheduler_priority" : 0,
          "type" : "disk",
+         "exotic" : "NO",
          "drain" : "NO",
          "core" : null,
          "next_finaud_decision" : "NO",
@@ -2887,15 +2892,15 @@
          "switch" : null,
          "disk" : "sdc.clusterc-2",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
-         "memcore" : null,
-         "wattmeter" : null,
-         "gpu_count" : null,
+         "memcore" : 8192,
+         "wattmeter" : "MULTIPLE",
+         "gpu_count" : 0,
          "deploy" : "YES",
          "available_upto" : 0,
          "suspended_jobs" : "NO",
-         "ip" : null,
-         "memnode" : null,
-         "cluster_priority" : null,
+         "ip" : "172.16.64.2",
+         "memnode" : 131072,
+         "cluster_priority" : 201906,
          "links" : [
             {
                "rel" : "member",
@@ -2914,55 +2919,55 @@
          ],
          "last_job_date" : 0,
          "id" : 37,
-         "opa_count" : null,
+         "opa_count" : 0,
          "next_state" : "UnChanged",
-         "memcpu" : null,
+         "memcpu" : 65536,
          "production" : "YES",
-         "ib" : null,
-         "ib_rate" : null,
-         "virtual" : null,
+         "ib" : "NO",
+         "ib_rate" : 0,
+         "virtual" : "ivt",
          "network_address" : "",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null
+         "mic" : "NO"
       },
       {
-         "cputype" : null,
+         "cputype" : "Intel Xeon Silver 4110",
          "cluster" : "clusterc",
-         "myri_count" : null,
+         "myri_count" : 0,
          "api_timestamp" : 1569605253,
-         "ib_count" : null,
+         "ib_count" : 0,
          "state" : "Alive",
          "cpuset" : -1,
-         "eth_rate" : null,
-         "cpuarch" : null,
+         "eth_rate" : 10,
+         "cpuarch" : "x86_64",
          "gpu" : null,
-         "max_walltime" : null,
-         "nodemodel" : null,
+         "max_walltime" : 0,
+         "nodemodel" : "Dell PowerEdge T640",
          "host" : "clusterc-2.fakesite.grid5000.fr",
          "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
          "maintenance" : "NO",
          "gpu_model" : null,
-         "cpucore" : null,
+         "cpucore" : 8,
          "besteffort" : "YES",
          "state_num" : 1,
-         "opa_rate" : null,
-         "myri" : null,
-         "disktype" : null,
-         "myri_rate" : null,
+         "opa_rate" : 0,
+         "myri" : "NO",
+         "disktype" : "SATA",
+         "myri_rate" : 0,
          "next_finaud_decision" : "NO",
          "cpu" : null,
          "scheduler_priority" : 0,
          "type" : "disk",
          "core" : null,
          "drain" : "NO",
-         "disk_reservation_count" : null,
-         "cpufreq" : null,
+         "disk_reservation_count" : 3,
+         "cpufreq" : "2.1",
          "finaud_decision" : "NO",
-         "eth_count" : null,
+         "eth_count" : 1,
          "last_available_upto" : 0,
          "expiry_date" : 0,
-         "ip" : null,
+         "ip" : "172.16.64.2",
          "deploy" : "YES",
          "available_upto" : 0,
          "suspended_jobs" : "NO",
@@ -2984,25 +2989,26 @@
             }
          ],
          "last_job_date" : 0,
-         "memnode" : null,
-         "cluster_priority" : null,
+         "memnode" : 131072,
+         "exotic" : "NO",
+         "cluster_priority" : 201906,
          "disk" : "sdd.clusterc-2",
          "switch" : null,
-         "memcore" : null,
-         "gpu_count" : null,
-         "wattmeter" : null,
+         "memcore" : 8192,
+         "gpu_count" : 0,
+         "wattmeter" : "MULTIPLE",
          "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
-         "ib_rate" : null,
+         "ib_rate" : 0,
          "network_address" : "",
-         "virtual" : null,
+         "virtual" : "ivt",
          "gpudevice" : null,
          "desktop_computing" : "NO",
-         "mic" : null,
-         "memcpu" : null,
+         "mic" : "NO",
+         "memcpu" : 65536,
          "next_state" : "UnChanged",
-         "opa_count" : null,
+         "opa_count" : 0,
          "production" : "YES",
-         "ib" : null
+         "ib" : "NO"
       }
    ],
    "api_timestamp" : 1569605253
-- 
GitLab