From 5964b1f98bdb1b009069638a00f94d82ed65219d Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Thu, 18 Jun 2020 17:45:59 +0200
Subject: [PATCH] [rspec] Update expected output for oar-properties (exotic on
 disk)

---
 spec/oar_properties_spec.rb                 |  2 +-
 spec/output/grimoire_empty_print_stdout.txt | 80 ++++++++++-----------
 spec/output/yeti_empty_print_stdout.txt     | 24 +++----
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/spec/oar_properties_spec.rb b/spec/oar_properties_spec.rb
index 096cb3d9911..cd3693f3741 100644
--- a/spec/oar_properties_spec.rb
+++ b/spec/oar_properties_spec.rb
@@ -968,7 +968,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 cpuset=-1
+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
 TXT
 
       generator_output = capture do
diff --git a/spec/output/grimoire_empty_print_stdout.txt b/spec/output/grimoire_empty_print_stdout.txt
index 643f39ce3b4..ca50952be9a 100644
--- a/spec/output/grimoire_empty_print_stdout.txt
+++ b/spec/output/grimoire_empty_print_stdout.txt
@@ -113,7 +113,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -121,7 +121,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -129,7 +129,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -137,7 +137,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -145,7 +145,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -178,7 +178,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -186,7 +186,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -194,7 +194,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -202,7 +202,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -210,7 +210,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -243,7 +243,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -251,7 +251,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -259,7 +259,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -267,7 +267,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -275,7 +275,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -308,7 +308,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -316,7 +316,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -324,7 +324,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -332,7 +332,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -340,7 +340,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -373,7 +373,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -381,7 +381,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -389,7 +389,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -397,7 +397,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-5 on host clustera-5.fakesite.grid5000.fr:'
@@ -405,7 +405,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -438,7 +438,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -446,7 +446,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -454,7 +454,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -462,7 +462,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-6 on host clustera-6.fakesite.grid5000.fr:'
@@ -470,7 +470,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -503,7 +503,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -511,7 +511,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -519,7 +519,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -527,7 +527,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-7 on host clustera-7.fakesite.grid5000.fr:'
@@ -535,7 +535,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -568,7 +568,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -576,7 +576,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -584,7 +584,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sde.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -592,7 +592,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdf.clustera-8 on host clustera-8.fakesite.grid5000.fr:'
@@ -600,6 +600,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 cpuset=-1
+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
 
 echo '================================================================================'
diff --git a/spec/output/yeti_empty_print_stdout.txt b/spec/output/yeti_empty_print_stdout.txt
index 484c60971a2..57b431ef76b 100644
--- a/spec/output/yeti_empty_print_stdout.txt
+++ b/spec/output/yeti_empty_print_stdout.txt
@@ -161,7 +161,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -169,7 +169,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-1 on host clustera-1.fakesite.grid5000.fr:'
@@ -177,7 +177,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -258,7 +258,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -266,7 +266,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-2 on host clustera-2.fakesite.grid5000.fr:'
@@ -274,7 +274,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -355,7 +355,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -363,7 +363,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-3 on host clustera-3.fakesite.grid5000.fr:'
@@ -371,7 +371,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 cpuset=-1
+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
 
 echo '================================================================================'
 
@@ -452,7 +452,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdc.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -460,7 +460,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 cpuset=-1
+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
 
 echo '================================================================================'
 echo; echo 'Adding disk sdd.clustera-4 on host clustera-4.fakesite.grid5000.fr:'
@@ -468,6 +468,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 cpuset=-1
+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
 
 echo '================================================================================'
-- 
GitLab